summaryrefslogtreecommitdiffstats
path: root/include/asm-x86/mpspec.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-12 15:17:14 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-12 15:17:14 +0200
commit620f2efcdc5c7a2db68da41bc3df3cf9a718024e (patch)
treeb1a0411e2588953777d0b10245b12044c33cef54 /include/asm-x86/mpspec.h
parentx86: xsave: set FP, SSE bits in the xsave header in the user sigcontext (diff)
parentMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tyt... (diff)
downloadlinux-620f2efcdc5c7a2db68da41bc3df3cf9a718024e.tar.xz
linux-620f2efcdc5c7a2db68da41bc3df3cf9a718024e.zip
Merge branch 'linus' into x86/xsave
Diffstat (limited to 'include/asm-x86/mpspec.h')
-rw-r--r--include/asm-x86/mpspec.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-x86/mpspec.h b/include/asm-x86/mpspec.h
index 118da365e371..be2241a818f1 100644
--- a/include/asm-x86/mpspec.h
+++ b/include/asm-x86/mpspec.h
@@ -5,11 +5,12 @@
#include <asm/mpspec_def.h>
+extern int apic_version[MAX_APICS];
+
#ifdef CONFIG_X86_32
#include <mach_mpspec.h>
extern unsigned int def_to_bigsmp;
-extern int apic_version[MAX_APICS];
extern u8 apicid_2_node[];
extern int pic_mode;