summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/apic.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-28 19:32:55 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-29 14:16:52 +0100
commit6bda2c8b32febeb38ee128047253751e080bad52 (patch)
tree7f6f78cf18cd69a44e987d985c57402d493d0dee /arch/x86/include/asm/apic.h
parentx86: move mach-default/*.h files to asm/ (diff)
downloadlinux-6bda2c8b32febeb38ee128047253751e080bad52.tar.xz
linux-6bda2c8b32febeb38ee128047253751e080bad52.zip
x86: remove subarchitecture support
Remove the 32-bit subarchitecture support code. All subarchitectures but Voyager have been converted. Voyager will be done later or will be removed. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/apic.h')
-rw-r--r--arch/x86/include/asm/apic.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 6a77068e261a..b03711d7990b 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -215,6 +215,7 @@ static inline void disable_local_APIC(void) { }
#define SET_APIC_ID(x) (apic->set_apic_id(x))
#else
+#ifdef CONFIG_X86_LOCAL_APIC
static inline unsigned default_get_apic_id(unsigned long x)
{
unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR));
@@ -224,6 +225,7 @@ static inline unsigned default_get_apic_id(unsigned long x)
else
return (x >> 24) & 0x0F;
}
+#endif
#endif