CONFIG_MULTIQUAD has got to go...
Linus,
The CONFIG_MULTIQUAD option has bothered me for a while now. It actually
covers the jobs of 3 config options, 2 of which exist.
This patch splits the use of CONFIG_MULTIQUAD into the 3 config options that it really means:CONFIG_X86_NUMA: General X86 NUMA code (already exists)CONFIG_X86_NUMAQ: Code specific to just the NUMA-Q platform (already exists)CONFIG_CLUSTERED_APIC: Code that specifically deals with clustered APIC mode (new option)
The patch replaces every occurence of CONFIG_MULTIQUAD in the kernel, save 1 (arch/i386/pci/Makefile), which is remedied by the patch I will send momentarily.
Please apply.
Cheers!
-Matt
arch/i386/boot/compressed/misc.c +1 -1
@@ -120,7 +120,7 @@static int vidport;static int lines, cols; -#ifdef CONFIG_MULTIQUAD +#ifdef CONFIG_X86_NUMAQ static void *const xquad_portio =NULL ;#endif
arch/i386/config.in +1 -1
@@ -173,7 +173,7 @@ #Platform Choices bool 'Multiquad (IBM/Sequent) NUMAQ support' CONFIG_X86_NUMAQ if [ "$CONFIG_X86_NUMAQ" = "y" ]; then - define_bool CONFIG_MULTIQUAD y + define_bool CONFIG_CLUSTERED_APIC y fi # Common NUMA Features if [ "$CONFIG_X86_NUMAQ" = "y" ]; then
arch/i386/defconfig +1 -1
@@ -60,7 +60,7 @@ CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_SMP=y # CONFIG_PREEMPT is not set -# CONFIG_MULTIQUAD is not set +# CONFIG_X86_NUMA is not set CONFIG_X86_MCE=y CONFIG_X86_MCE_NONFATAL=y CONFIG_X86_MCE_P4THERMAL=y
arch/i386/kernel/trampoline.S +0 -2
@@ -36,9 +36,7 @@ ENTRY(trampoline_data) r_base = . -#ifdef CONFIG_MULTIQUAD wbinvd -#endif /* CONFIG_MULTIQUAD */ mov %cs, %ax # Code and data in the same place mov %ax, %ds
include/asm-i386/io.h +8 -8
@@ -298,9 +298,9 @@#define __FULL_SLOW_DOWN_IO __SLOW_DOWN_IO#endif -#ifdef CONFIG_MULTIQUAD +#ifdef CONFIG_X86_NUMAQ extern void *xquad_portio;/* Where the IO area was mapped */ -#endif /* CONFIG_MULTIQUAD */ +#endif /* CONFIG_X86_NUMAQ */ /* * Talk about misusing macros..
@@ -311,7 +311,7 @@#define __OUT2 (s,s1,s2) \ __asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1" -#ifdef CONFIG_MULTIQUAD +#ifdef CONFIG_X86_NUMAQ #define __OUTQ (s,ss,x)/* Do the equivalent of the portio op on quads */ \ static inline void out##ss(unsigned x value, unsigned short port) { \ if (xquad_portio) \
@@ -339,9 +339,9 @@ else\ return 0;\ } -#endif /* CONFIG_MULTIQUAD */ +#endif /* CONFIG_X86_NUMAQ */ -#ifndef CONFIG_MULTIQUAD +#ifndef CONFIG_X86_NUMAQ #define __OUT (s,s1,x) \ __OUT1(s,x) __OUT2(s,s1,"w") : : "a" (value), "Nd" (port)); } \ __OUT1(s##_p,x) __OUT2(s,s1,"w") __FULL_SLOW_DOWN_IO : : "a" (value), "Nd" (port));}
@@ -352,7 +352,7 @@ __OUT1(s##_p_local,x) __OUT2(s,s1,"w") __FULL_SLOW_DOWN_IO : : "a" (value), "Nd" (port));} \ __OUTQ(s,s,x) \ __OUTQ(s,s##_p,x) -#endif /* CONFIG_MULTIQUAD */ +#endif /* CONFIG_X86_NUMAQ */#define __IN1 (s) \ static inline RETURN_TYPE in##s(unsigned short port) { RETURN_TYPE _v;
@@ -360,7 +360,7 @@#define __IN2 (s,s1,s2) \ __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0" -#ifndef CONFIG_MULTIQUAD +#ifndef CONFIG_X86_NUMAQ #define __IN(s,s1,i...) \ __IN1(s) __IN2(s,s1,"w") : "=a" (_v) : "Nd" (port) ,##i ); return _v; } \ __IN1(s##_p) __IN2(s,s1,"w") __FULL_SLOW_DOWN_IO : "=a" (_v) : "Nd" (port) ,##i ); return _v; }
@@ -371,7 +371,7 @@ __IN1(s##_p_local) __IN2(s,s1,"w") __FULL_SLOW_DOWN_IO : "=a" (_v) : "Nd" (port) ,##i ); return _v; } \ __INQ(s,s) \ __INQ(s,s##_p) -#endif /* CONFIG_MULTIQUAD */ +#endif /* CONFIG_X86_NUMAQ */ #define __INS(s) \ static inline void ins##s(unsigned short port, void * addr, unsigned long count) \
include/asm-i386/mpspec.h +6 -6
@@ -16,11 +16,11 @@/* * a maximum of 16 APICs with the current APIC ID architecture. */ -#ifdef CONFIG_MULTIQUAD +#ifdef CONFIG_X86_NUMA #define MAX_APICS 256 -#else /* !CONFIG_MULTIQUAD */ +#else /* !CONFIG_X86_NUMA */ #define MAX_APICS 16 -#endif /* CONFIG_MULTIQUAD */ +#endif /* CONFIG_X86_NUMA */ #define MAX_MPC_ENTRY 1024
@@ -184,11 +184,11 @@* 7 2 CPU MCA+PCI */ -#ifdef CONFIG_MULTIQUAD +#ifdef CONFIG_X86_NUMA #define MAX_IRQ_SOURCES 512 -#else /* !CONFIG_MULTIQUAD */ +#else /* !CONFIG_X86_NUMA */ #define MAX_IRQ_SOURCES 256 -#endif /* CONFIG_MULTIQUAD */ +#endif /* CONFIG_X86_NUMA */ #define MAX_MP_BUSSES 32enum mp_bustype {
include/asm-i386/smp.h +4 -4
@@ -22,7 +22,7 @@#endif #ifdef CONFIG_SMP -# ifdef CONFIG_MULTIQUAD +# ifdef CONFIG_CLUSTERED_APIC # define TARGET_CPUS 0xf/* all CPUs in *THIS* quad */ # define INT_DELIVERY_MODE 0/* physical delivery on LOCAL quad */ # else
@@ -35,13 +35,13 @@#endif #ifndef clustered_apic_mode -#ifdef CONFIG_MULTIQUAD +#ifdef CONFIG_CLUSTERED_APIC #define clustered_apic_mode (1)#define esr_disable (1) -#else /* !CONFIG_MULTIQUAD */ +#else /* !CONFIG_CLUSTERED_APIC */ #define clustered_apic_mode (0)#define esr_disable (0) -#endif /* CONFIG_MULTIQUAD */ +#endif /* CONFIG_CLUSTERED_APIC */ #endif #ifdef CONFIG_SMP
include/asm-i386/smpboot.h +15 -20
@@ -2,35 +2,35 @@#define __ASM_SMPBOOT_H#ifndef clustered_apic_mode -#ifdef CONFIG_MULTIQUAD +#ifdef CONFIG_CLUSTERED_APIC #define clustered_apic_mode (1) -#else /* !CONFIG_MULTIQUAD */ +#else /* !CONFIG_CLUSTERED_APIC */ #define clustered_apic_mode (0) -#endif /* CONFIG_MULTIQUAD */ +#endif /* CONFIG_CLUSTERED_APIC */ #endif -#ifdef CONFIG_MULTIQUAD +#ifdef CONFIG_CLUSTERED_APIC #define TRAMPOLINE_LOW phys_to_virt(0x8)#define TRAMPOLINE_HIGH phys_to_virt(0xa) -#else /* !CONFIG_MULTIQUAD */ +#else /* !CONFIG_CLUSTERED_APIC */ #define TRAMPOLINE_LOW phys_to_virt(0x467)#define TRAMPOLINE_HIGH phys_to_virt(0x469) -#endif /* CONFIG_MULTIQUAD */ +#endif /* CONFIG_CLUSTERED_APIC */ -#ifdef CONFIG_MULTIQUAD +#ifdef CONFIG_CLUSTERED_APIC #define boot_cpu_apicid boot_cpu_logical_apicid -#else /* !CONFIG_MULTIQUAD */ +#else /* !CONFIG_CLUSTERED_APIC */ #define boot_cpu_apicid boot_cpu_physical_apicid -#endif /* CONFIG_MULTIQUAD */ +#endif /* CONFIG_CLUSTERED_APIC */ /* * How to map from the cpu_present_map */ -#ifdef CONFIG_MULTIQUAD +#ifdef CONFIG_CLUSTERED_APIC #define cpu_present_to_apicid (mps_cpu) ( ((mps_cpu/4)*16) + (1<<(mps_cpu%4)) ) -#else /* !CONFIG_MULTIQUAD */ +#else /* !CONFIG_CLUSTERED_APIC */ #define cpu_present_to_apicid (apicid) (apicid) -#endif /* CONFIG_MULTIQUAD */ +#endif /* CONFIG_CLUSTERED_APIC */ /* * Mappings between logical cpu number and logical / physical apicid
@@ -45,18 +45,13 @@#define cpu_to_logical_apicid (cpu) cpu_2_logical_apicid[cpu]#define physical_apicid_to_cpu (apicid) physical_apicid_2_cpu[apicid]#define cpu_to_physical_apicid (cpu) cpu_2_physical_apicid[cpu] -#ifdef CONFIG_MULTIQUAD /* use logical IDs to bootstrap */ +#ifdef CONFIG_CLUSTERED_APIC /* use logical IDs to bootstrap */ #define boot_apicid_to_cpu (apicid) logical_apicid_2_cpu[apicid]#define cpu_to_boot_apicid (cpu) cpu_2_logical_apicid[cpu] -#else /* !CONFIG_MULTIQUAD */ /* use physical IDs to bootstrap */ +#else /* !CONFIG_CLUSTERED_APIC */ /* use physical IDs to bootstrap */ #define boot_apicid_to_cpu (apicid) physical_apicid_2_cpu[apicid]#define cpu_to_boot_apicid (cpu) cpu_2_physical_apicid[cpu] -#endif /* CONFIG_MULTIQUAD */ - - -#ifdef CONFIG_MULTIQUAD -#else /* !CONFIG_MULTIQUAD */ -#endif /* CONFIG_MULTIQUAD */ +#endif /* CONFIG_CLUSTERED_APIC */ #endif
kernel/printk.c +1 -1
@@ -30,7 +30,7 @@#include <asm/uaccess.h> -#if defined(CONFIG_MULTIQUAD ) || defined(CONFIG_IA64 ) +#if defined(CONFIG_X86_NUMA ) || defined(CONFIG_IA64 )#define LOG_BUF_LEN (65536)#elif defined(CONFIG_ARCH_S390 )#define LOG_BUF_LEN (131072)
Quoted 11 lines
Linus,
TheCONFIG_MULTIQUADoption has bothered me for a while now. It actually covers the jobs of 3 config options, 2 of which exist.This patch splits the use of
CONFIG_MULTIQUADinto the 3 config options that it really means:CONFIG_X86_NUMA: General X86 NUMA code (already exists)CONFIG_X86_NUMAQ: Code specific to just the NUMA-Q platform (already exists)CONFIG_CLUSTERED_APIC: Code that specifically deals with clustered APIC mode (new option)The patch replaces every occurence of
CONFIG_MULTIQUADin the kernel, save 1 (arch/i386/pci/Makefile), which is remedied by the patch I will send momentarily.Please apply.
As the person who put this in there in the first place ... then extended it beyond any sane use ... I agree this should die ;-) The new naming scheme makes much more sense ...
M.