summaryrefslogtreecommitdiffstats
path: root/include/asm-x86
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-10 15:13:41 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-10 18:55:38 +0200
commit18c413e27e1585358cedc22e450847e3240006ff (patch)
tree96f17e624eab1b2bb1d9e7758836d6cb7cd0f56c /include/asm-x86
parentb70d9c2473ffbe327f5d7364bfbf67e94c440af8 (diff)
downloadlinux-18c413e27e1585358cedc22e450847e3240006ff.tar.gz
linux-18c413e27e1585358cedc22e450847e3240006ff.tar.bz2
linux-18c413e27e1585358cedc22e450847e3240006ff.zip
x86, VisWS: turn into generic arch, eliminate asm-x86/mach-visws/mach_apicdef.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86')
-rw-r--r--include/asm-x86/mach-visws/mach_apicdef.h25
1 files changed, 1 insertions, 24 deletions
diff --git a/include/asm-x86/mach-visws/mach_apicdef.h b/include/asm-x86/mach-visws/mach_apicdef.h
index e4b29ba37de6..42711d152a93 100644
--- a/include/asm-x86/mach-visws/mach_apicdef.h
+++ b/include/asm-x86/mach-visws/mach_apicdef.h
@@ -1,24 +1 @@
-#ifndef __ASM_MACH_APICDEF_H
-#define __ASM_MACH_APICDEF_H
-
-#include <asm/apic.h>
-
-#ifdef CONFIG_X86_64
-#define APIC_ID_MASK (0xFFu<<24)
-#define GET_APIC_ID(x) (((x)>>24)&0xFFu)
-#define SET_APIC_ID(x) (((x)<<24))
-#else
-#define APIC_ID_MASK (0xF<<24)
-static inline unsigned get_apic_id(unsigned long x)
-{
- unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR));
- if (APIC_XAPIC(ver))
- return (((x)>>24)&0xFF);
- else
- return (((x)>>24)&0xF);
-}
-
-#define GET_APIC_ID(x) get_apic_id(x)
-#endif
-
-#endif
+#include "../mach-default/mach_apicdef.h"