From owner-svn-src-head@freebsd.org Fri Aug 11 18:09:28 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 35D19DDF054; Fri, 11 Aug 2017 18:09:28 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0396B8105C; Fri, 11 Aug 2017 18:09:27 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7BI9RKF014245; Fri, 11 Aug 2017 18:09:27 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7BI9R06014244; Fri, 11 Aug 2017 18:09:27 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201708111809.v7BI9R06014244@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 11 Aug 2017 18:09:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r322409 - head/sys/arm/at91 X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/sys/arm/at91 X-SVN-Commit-Revision: 322409 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Aug 2017 18:09:28 -0000 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);