- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh.

[linux-flexiantxendom0-3.2.10.git] / arch / x86 / include / asm / apicdef.h

diff --git a/arch/x86/include/asm/apicdef.h b/arch/x86/include/asm/apicdef.h
index d5f94ad..7fe3b30 100644 (file)
--- a/arch/x86/include/asm/apicdef.h
+++ b/arch/x86/include/asm/apicdef.h
@@ -11,7 +11,11 @@
 #define IO_APIC_DEFAULT_PHYS_BASE      0xfec00000
 #define        APIC_DEFAULT_PHYS_BASE          0xfee00000
 
-#ifndef CONFIG_XEN
+/*
+ * This is the IO-APIC register space as specified
+ * by Intel docs:
+ */
+#define IO_APIC_SLOT_SIZE              1024
 
 #define        APIC_ID         0x20
 
@@ -138,16 +142,6 @@
 #define APIC_BASE_MSR  0x800
 #define X2APIC_ENABLE  (1UL << 10)
 
-#else /* CONFIG_XEN */
-
-enum {
-       APIC_DEST_ALLBUT = 0x1,
-       APIC_DEST_SELF,
-       APIC_DEST_ALLINC
-};
-
-#endif /* CONFIG_XEN */
-
 #ifdef CONFIG_X86_32
 # define MAX_IO_APICS 64
 #else
@@ -155,8 +149,6 @@ enum {
 # define MAX_LOCAL_APIC 32768
 #endif
 
-#ifndef CONFIG_XEN
-
 /*
  * All x86-64 systems are xAPIC compatible.
  * In the following, "apicid" is a physical APIC ID.
@@ -427,8 +419,6 @@ struct local_apic {
 
 #undef u32
 
-#endif /* CONFIG_XEN */
-
 #ifdef CONFIG_X86_32
  #define BAD_APICID 0xFFu
 #else