Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758640Ab2FFVaO (ORCPT ); Wed, 6 Jun 2012 17:30:14 -0400 Received: from oproxy9.bluehost.com ([69.89.24.6]:40592 "HELO oproxy9.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1756206Ab2FFVaM (ORCPT ); Wed, 6 Jun 2012 17:30:12 -0400 Message-ID: <4FCFCBD9.8080700@xenotime.net> Date: Wed, 06 Jun 2012 14:30:01 -0700 From: Randy Dunlap User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110323 Thunderbird/3.1.9 MIME-Version: 1.0 To: Mauro Carvalho Chehab CC: Stephen Rothwell , linux-next@vger.kernel.org, LKML , Doug Thompson , Borislav Petkov , linux-edac@vger.kernel.org Subject: Re: linux-next: Tree for Jun 5 (amd64_edac) References: <20120605133000.f2d21fb02881ef54a7bfe728@canb.auug.org.au> <4FCE333F.6060207@xenotime.net> <4FCE4408.1030506@redhat.com> In-Reply-To: <4FCE4408.1030506@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Identified-User: {1807:box742.bluehost.com:xenotime:xenotime.net} {sentby:smtp auth 50.53.38.135 authed with rdunlap@xenotime.net} Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1792 Lines: 70 On 06/05/2012 10:38 AM, Mauro Carvalho Chehab wrote: > Hi Randy, > > Em 05-06-2012 13:26, Randy Dunlap escreveu: >> On 06/04/2012 08:30 PM, Stephen Rothwell wrote: >> >>> Hi all, >>> >>> There will be no linux-next release tomorrow. >>> >>> Changes since 20120604: >> >> >> >> on x86_64: >> >> drivers/edac/amd64_edac_inj.o: In function `amd64_remove_sysfs_dbg_files': >> amd64_edac_inj.c:(.text+0x420): multiple definition of `amd64_remove_sysfs_dbg_files' >> drivers/edac/amd64_edac.o:amd64_edac.c:(.text+0x3d60): first defined here >> make[3]: *** [drivers/edac/amd64_edac_mod.o] Error 1 >> >> >> Full randconfig file is attached. >> >> > > Thanks for pointing it. The enclosed patch should fix it. > > amd64_edac: Avoid compilation breakage > > when: > CONFIG_EDAC_AMD64=m > CONFIG_EDAC_AMD64_ERROR_INJECTION=y > # CONFIG_EDAC_DEBUG is not set > > The compilation breaks, as amd64_remove_sysfs_dbg_files() were not declared > as static. > > Signed-off-by: Mauro Carvalho Chehab Acked-by: Randy Dunlap Thanks. > > diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h > index 098f336..8d48047 100644 > --- a/drivers/edac/amd64_edac.h > +++ b/drivers/edac/amd64_edac.h > @@ -421,7 +421,7 @@ static inline int amd64_create_sysfs_dbg_files(struct mem_ctl_info *mci) > { > return 0; > } > -void inline amd64_remove_sysfs_dbg_files(struct mem_ctl_info *mci) > +static void inline amd64_remove_sysfs_dbg_files(struct mem_ctl_info *mci) > { > } > #endif > -- -- ~Randy -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/