From 5672553cc835c2efbffb8168764ec1791ba2e337 Mon Sep 17 00:00:00 2001 From: Andrew Morton <akpm@digeo.com> Date: Mon, 10 Mar 2003 01:36:27 -0800 Subject: [PATCH] [PATCH] revert "noirqbalance still doesn't do anything" This recent patch caused Nick Piggin's 2xPIII VIA686B chipset machine into an interrupts-off lockup during IDE probing. We don't really know why - it might be because an interrupt is delivered to a secondary which doesn't expect it. I have a second patch from Zwane which solves the same problem in a different way, but until that's had some wider testing I suggest we just back off the original. --- include/asm-i386/mach-bigsmp/mach_apic.h | 2 +- include/asm-i386/mach-default/mach_apic.h | 2 +- include/asm-i386/mach-summit/mach_apic.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/asm-i386/mach-bigsmp/mach_apic.h b/include/asm-i386/mach-bigsmp/mach_apic.h index d49156a533c3..b6d7c5e946a3 100644 --- a/include/asm-i386/mach-bigsmp/mach_apic.h +++ b/include/asm-i386/mach-bigsmp/mach_apic.h @@ -19,7 +19,7 @@ static inline int apic_id_registered(void) } #define APIC_DFR_VALUE (APIC_DFR_CLUSTER) -#define TARGET_CPUS ((cpu_callout_map < 0xf)?cpu_callout_map:0xf) +#define TARGET_CPUS ((cpu_online_map < 0xf)?cpu_online_map:0xf) #define INT_DELIVERY_MODE dest_LowestPrio #define INT_DEST_MODE 1 /* logical delivery broadcast to all procs */ diff --git a/include/asm-i386/mach-default/mach_apic.h b/include/asm-i386/mach-default/mach_apic.h index a7744edacd94..8a1311d6df7b 100644 --- a/include/asm-i386/mach-default/mach_apic.h +++ b/include/asm-i386/mach-default/mach_apic.h @@ -4,7 +4,7 @@ #define APIC_DFR_VALUE (APIC_DFR_FLAT) #ifdef CONFIG_SMP - #define TARGET_CPUS (cpu_callout_map) + #define TARGET_CPUS (cpu_online_map) #else #define TARGET_CPUS 0x01 #endif diff --git a/include/asm-i386/mach-summit/mach_apic.h b/include/asm-i386/mach-summit/mach_apic.h index c84b8b8b64b2..988e40647378 100644 --- a/include/asm-i386/mach-summit/mach_apic.h +++ b/include/asm-i386/mach-summit/mach_apic.h @@ -13,7 +13,7 @@ extern int x86_summit; ((phys_apic) & XAPIC_DEST_CLUSTER_MASK) ) #define APIC_DFR_VALUE (x86_summit ? APIC_DFR_CLUSTER : APIC_DFR_FLAT) -#define TARGET_CPUS (x86_summit ? XAPIC_DEST_CPUS_MASK : cpu_callout_map) +#define TARGET_CPUS (x86_summit ? XAPIC_DEST_CPUS_MASK : cpu_online_map) #define INT_DELIVERY_MODE (x86_summit ? dest_Fixed : dest_LowestPrio) #define INT_DEST_MODE 1 /* logical delivery broadcast to all procs */ -- 2.30.9