From 9432a9bd9fd24a8ce644dd19ab07b2f6f7d7b005 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Fri, 11 Aug 2017 18:09:26 +0000 Subject: [PATCH] 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 --- sys/arm/at91/at91_pmc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/arm/at91/at91_pmc.c b/sys/arm/at91/at91_pmc.c index 572bfa0de2b..10b124890f9 100644 --- a/sys/arm/at91/at91_pmc.c +++ b/sys/arm/at91/at91_pmc.c @@ -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);