summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorBorislav Petkov <petkovbb@googlemail.com>2009-12-17 00:16:25 +0100
committerH. Peter Anvin <hpa@zytor.com>2009-12-16 15:36:32 -0800
commit6ede31e03084ee084bcee073ef3d1136f68d0906 (patch)
treeb10344809c72de850c11701cdbc0194d042fb79a /arch/x86/include/asm
parent9d260ebc09a0ad6b5c73e17676df42c7bc75ff64 (diff)
downloadblackbird-obmc-linux-6ede31e03084ee084bcee073ef3d1136f68d0906.tar.gz
blackbird-obmc-linux-6ede31e03084ee084bcee073ef3d1136f68d0906.zip
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>
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r--arch/x86/include/asm/msr.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index cf985aa00660..c5bc4c2d33f5 100644
--- a/arch/x86/include/asm/msr.h
+++ b/arch/x86/include/asm/msr.h
@@ -27,6 +27,18 @@ struct msr {
};
};
+struct msr_info {
+ u32 msr_no;
+ struct msr reg;
+ struct msr *msrs;
+ int err;
+};
+
+struct msr_regs_info {
+ u32 *regs;
+ int err;
+};
+
static inline unsigned long long native_read_tscp(unsigned int *aux)
{
unsigned long low, high;
OpenPOWER on IntegriCloud