[PATCH] nuke clustered_apic_mode and friends

OK, the grand finale ... NUMA-Q is now moved into subarch, so we can
kill off the last vestiges - CONFIG_CLUSTERED_APIC, clustered_apic_mode,
and smpboot.h (which only contains machine specific stuff now anyway).
the esr_disable switch was the last bit, that goes to subarch too.

If you end up with an empty smpboot.h due to patch / bitkeeper interactions,
please remove it after this ...

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 186f22f8c1cfc196388b84b94d98def10b9b04dc..33886ce732a2a9a00fb73ef50889dc678c404031 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -456,11 +456,6 @@ config NR_CPUS
          This is purely to save memory - each supported CPU adds
          approximately eight kilobytes to the kernel image.
 
-config CLUSTERED_APIC
-       bool
-       depends on X86_NUMAQ || X86_SUMMIT
-       default y
-
 # Common NUMA Features
 config NUMA
        bool "Numa Memory Allocation Support"

diff --git a/arch/i386/kernel/smp.c b/arch/i386/kernel/smp.c
index 3f42c6e3f011815830105923c326ceff4d326785..4a77837cca8b5afca413f7ee7a105c341003c9e9 100644 (file)
--- a/arch/i386/kernel/smp.c
+++ b/arch/i386/kernel/smp.c
@@ -23,7 +23,6 @@
 #include <asm/mtrr.h>
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
-#include <asm/smpboot.h>
 #include <mach_ipi.h>
 
 /*

diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index f8947ebc52689ecef382cc3e6d76978d5d6e1c4b..2ae47acb4338962957a1ad9f7049a38653c88910 100644 (file)
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -47,7 +47,6 @@
 #include <linux/mc146818rtc.h>
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
-#include <asm/smpboot.h>
 #include <asm/desc.h>
 #include <asm/arch_hooks.h>
 #include "smpboot_hooks.h"

diff --git a/arch/i386/mach-voyager/voyager_smp.c b/arch/i386/mach-voyager/voyager_smp.c
index fe3569203ce6dac89010f9b783993587936a5030..cdbc7915b438f64b699908aa0cd8cccb0d640bd1 100644 (file)
--- a/arch/i386/mach-voyager/voyager_smp.c
+++ b/arch/i386/mach-voyager/voyager_smp.c
@@ -28,7 +28,6 @@
 #include <asm/mtrr.h>
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
-#include <asm/smpboot.h>
 #include <asm/desc.h>
 #include <asm/arch_hooks.h>
 

diff --git a/arch/i386/pci/numa.c b/arch/i386/pci/numa.c
index 58123c0e0cdb33b432b8cdd6e1052de901719aab..433e1bbc577ce1b5d3b1252bfb0e158b7ad28b9a 100644 (file)
--- a/arch/i386/pci/numa.c
+++ b/arch/i386/pci/numa.c
@@ -127,7 +127,7 @@ static int __init pci_numa_init(void)
                return 0;
 
        pci_root_bus = pcibios_scan_root(0);
-       if (clustered_apic_mode && (numnodes > 1)) {
+       if (numnodes > 1) {
                for (quad = 1; quad < numnodes; ++quad) {
                        printk("Scanning PCI bus %d for quad %d\n", 
                                QUADLOCAL2BUS(quad,0), quad);

diff --git a/include/asm-i386/mach-default/mach_apic.h b/include/asm-i386/mach-default/mach_apic.h
index 56a355ddd5dc2d5784ca36c20e80349514a005fc..9405531fb35b309edbdacc471086bafacab5548f 100644 (file)
--- a/include/asm-i386/mach-default/mach_apic.h
+++ b/include/asm-i386/mach-default/mach_apic.h
@@ -10,6 +10,7 @@
 #endif
 
 #define no_balance_irq (0)
+#define esr_disable (0)
 
 #define APIC_BROADCAST_ID      0x0F
 #define check_apicid_used(bitmap, apicid) (bitmap & (1 << apicid))

diff --git a/include/asm-i386/mach-numaq/mach_apic.h b/include/asm-i386/mach-numaq/mach_apic.h
index 6b9478e0029bb97228ac903dce482f85af8e259e..05c0fd19266d748eab4b93309a95c15d34947a02 100644 (file)
--- a/include/asm-i386/mach-numaq/mach_apic.h
+++ b/include/asm-i386/mach-numaq/mach_apic.h
@@ -6,6 +6,7 @@
 #define TARGET_CPUS (0xf)
 
 #define no_balance_irq (1)
+#define esr_disable (1)
 
 #define APIC_BROADCAST_ID      0x0F
 #define check_apicid_used(bitmap, apicid) ((bitmap) & (1 << (apicid)))

diff --git a/include/asm-i386/mach-summit/mach_apic.h b/include/asm-i386/mach-summit/mach_apic.h
index 2d934b736af947f9780162baaa364c6fc0f20e7b..78f6b26f0ead5ca286404f85a8479d9b10f9981e 100644 (file)
--- a/include/asm-i386/mach-summit/mach_apic.h
+++ b/include/asm-i386/mach-summit/mach_apic.h
@@ -3,6 +3,8 @@
 
 extern int x86_summit;
 
+#define esr_disable (1)
+
 #define XAPIC_DEST_CPUS_MASK    0x0Fu
 #define XAPIC_DEST_CLUSTER_MASK 0xF0u
 

diff --git a/include/asm-i386/numaq.h b/include/asm-i386/numaq.h
index 6f52745df91c8793fec5e7a0c04c8b995bf7c2c3..1d9c8d48f06a47f011240c77ce9e9d54a0d191d9 100644 (file)
--- a/include/asm-i386/numaq.h
+++ b/include/asm-i386/numaq.h
@@ -28,8 +28,6 @@
 
 #ifdef CONFIG_X86_NUMAQ
 
-#include <asm/smpboot.h>
-
 /*
  * for now assume that 64Gb is max amount of RAM for whole system
  *    64Gb / 4096bytes/page = 16777216 pages

diff --git a/include/asm-i386/smp.h b/include/asm-i386/smp.h
index 3e11f8a3c3604c3fb559e0035c404beeeb7ac635..85c61d5f94977f77daadc9d95bada135251d75b4 100644 (file)
--- a/include/asm-i386/smp.h
+++ b/include/asm-i386/smp.h
@@ -28,16 +28,6 @@
  #define INT_DELIVERY_MODE 1     /* logical delivery broadcast to all procs */
 #endif
 
-#ifndef clustered_apic_mode
- #ifdef CONFIG_CLUSTERED_APIC
-  #define clustered_apic_mode (1)
-  #define esr_disable (1)
- #else /* !CONFIG_CLUSTERED_APIC */
-  #define clustered_apic_mode (0)
-  #define esr_disable (0)
- #endif /* CONFIG_CLUSTERED_APIC */
-#endif 
-
 #define BAD_APICID 0xFFu
 #ifdef CONFIG_SMP
 #ifndef __ASSEMBLY__

diff --git a/include/asm-i386/smpboot.h b/include/asm-i386/smpboot.h
deleted file mode 100644 (file)
index a34f4a0..0000000
--- a/include/asm-i386/smpboot.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __ASM_SMPBOOT_H
-#define __ASM_SMPBOOT_H
-
-#ifndef clustered_apic_mode
- #ifdef CONFIG_CLUSTERED_APIC
-  #define clustered_apic_mode (1)
- #else /* !CONFIG_CLUSTERED_APIC */
-  #define clustered_apic_mode (0)
- #endif /* CONFIG_CLUSTERED_APIC */
-#endif 
- 
-#endif