Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 11 Aug 2017 18:09:27 +0000 (UTC)
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r322409 - head/sys/arm/at91
Message-ID:  <201708111809.v7BI9R06014244@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: emaste
Date: Fri Aug 11 18:09:26 2017
New Revision: 322409
URL: https://svnweb.freebsd.org/changeset/base/322409

Log:
  Rename at91_pmc's M_PMC malloc type to avoid duplicate definition
  
  M_PMC is defined in sys/dev/hwpmc/hwpmc_mod.c, and the LINT kernel build
  fails when linking with lld due to a duplicate symbol error.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/arm/at91/at91_pmc.c

Modified: head/sys/arm/at91/at91_pmc.c
==============================================================================
--- head/sys/arm/at91/at91_pmc.c	Fri Aug 11 17:43:25 2017	(r322408)
+++ head/sys/arm/at91/at91_pmc.c	Fri Aug 11 18:09:26 2017	(r322409)
@@ -63,8 +63,8 @@ static struct at91_pmc_softc {
 
 static uint32_t pllb_init;
 
-MALLOC_DECLARE(M_PMC);
-MALLOC_DEFINE(M_PMC, "at91_pmc_clocks", "AT91 PMC Clock descriptors");
+MALLOC_DECLARE(M_PMC_CLK);
+MALLOC_DEFINE(M_PMC_CLK, "at91_pmc_clocks", "AT91 PMC Clock descriptors");
 
 #define AT91_PMC_BASE 0xffffc00
 
@@ -300,12 +300,12 @@ at91_pmc_clock_add(const char *name, uint32_t irq,
 	struct at91_pmc_clock *clk;
 	int i, buflen;
 
-	clk = malloc(sizeof(*clk), M_PMC, M_NOWAIT | M_ZERO);
+	clk = malloc(sizeof(*clk), M_PMC_CLK, M_NOWAIT | M_ZERO);
 	if (clk == NULL)
 		goto err;
 
 	buflen = strlen(name) + 1;
-	clk->name = malloc(buflen, M_PMC, M_NOWAIT);
+	clk->name = malloc(buflen, M_PMC_CLK, M_NOWAIT);
 	if (clk->name == NULL)
 		goto err;
 
@@ -326,8 +326,8 @@ at91_pmc_clock_add(const char *name, uint32_t irq,
 err:
 	if (clk != NULL) {
 		if (clk->name != NULL)
-			free(clk->name, M_PMC);
-		free(clk, M_PMC);
+			free(clk->name, M_PMC_CLK);
+		free(clk, M_PMC_CLK);
 	}
 
 	panic("could not allocate pmc clock '%s'", name);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708111809.v7BI9R06014244>