On Wed, 16 Dec 2009 22:58:08 +0100 Borislav Petkov wrote: > On Wed, Dec 16, 2009 at 01:51:19PM -0800, Randy Dunlap wrote: > > From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> > > > > Rearrange arch/x86/lib/msr.c so that alloc/free are built and > > usable when CONFIG_SMP=n. Fixes build of amd64_edac. > > > > ERROR: "msrs_free" [drivers/edac/amd64_edac_mod.ko] undefined! > > ERROR: "msrs_alloc" [drivers/edac/amd64_edac_mod.ko] undefined! > > > > --- > > arch/x86/lib/Makefile | 2 - > > arch/x86/lib/msr.c | 42 ++++++++++++++++++++-------------------- > > 2 files changed, 23 insertions(+), 21 deletions(-) > > Haha, I just sent a very similar one :) Yes, I noticed. > > > > --- linux-next-20091216.orig/arch/x86/lib/Makefile > > +++ linux-next-20091216/arch/x86/lib/Makefile > > @@ -14,7 +14,7 @@ $(obj)/inat.o: $(obj)/inat-tables.c > > > > clean-files := inat-tables.c > > > > -obj-$(CONFIG_SMP) := msr.o > > +obj-$(CONFIG_X86_MSR) := msr.o > > however, CONFIG_X86_MSR is the x86 MSR access module and the <lib/msr.c> > is the library of MSR accessing functions which is always in. So this > should be unconditional as in my version or Peter might have a better > idea...? Sure, whichever is OK with me. --- ~Randy -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
