]> bbs.cooldavid.org Git - net-next-2.6.git/commit
x86, msr: msrs_alloc/free for CONFIG_SMP=n
authorBorislav Petkov <petkovbb@googlemail.com>
Wed, 16 Dec 2009 23:16:25 +0000 (00:16 +0100)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 16 Dec 2009 23:36:32 +0000 (15:36 -0800)
commit6ede31e03084ee084bcee073ef3d1136f68d0906
treeb10344809c72de850c11701cdbc0194d042fb79a
parent9d260ebc09a0ad6b5c73e17676df42c7bc75ff64
x86, msr: msrs_alloc/free for CONFIG_SMP=n

Randy Dunlap reported the following build error:

"When CONFIG_SMP=n, CONFIG_X86_MSR=m:

ERROR: "msrs_free" [drivers/edac/amd64_edac_mod.ko] undefined!
ERROR: "msrs_alloc" [drivers/edac/amd64_edac_mod.ko] undefined!"

This is due to the fact that <arch/x86/lib/msr.c> is conditioned on
CONFIG_SMP and in the UP case we have only the stubs in the header.
Fork off SMP functionality into a new file (msr-smp.c) and build
msrs_{alloc,free} unconditionally.

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
LKML-Reference: <20091216231625.GD27228@liondog.tnic>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
arch/x86/include/asm/msr.h
arch/x86/lib/Makefile
arch/x86/lib/msr-smp.c [new file with mode: 0644]
arch/x86/lib/msr.c