Re: linux-next: Tree for Jun 5 (amd64_edac)

Hi Randy,

Em 05-06-2012 13:26, Randy Dunlap escreveu:

On 06/04/2012 08:30 PM, Stephen Rothwell wrote:

quoted

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 <redacted>

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