Commit 5672553c authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[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.
parent d3806951
...@@ -19,7 +19,7 @@ static inline int apic_id_registered(void) ...@@ -19,7 +19,7 @@ static inline int apic_id_registered(void)
} }
#define APIC_DFR_VALUE (APIC_DFR_CLUSTER) #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_DELIVERY_MODE dest_LowestPrio
#define INT_DEST_MODE 1 /* logical delivery broadcast to all procs */ #define INT_DEST_MODE 1 /* logical delivery broadcast to all procs */
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#define APIC_DFR_VALUE (APIC_DFR_FLAT) #define APIC_DFR_VALUE (APIC_DFR_FLAT)
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
#define TARGET_CPUS (cpu_callout_map) #define TARGET_CPUS (cpu_online_map)
#else #else
#define TARGET_CPUS 0x01 #define TARGET_CPUS 0x01
#endif #endif
......
...@@ -13,7 +13,7 @@ extern int x86_summit; ...@@ -13,7 +13,7 @@ extern int x86_summit;
((phys_apic) & XAPIC_DEST_CLUSTER_MASK) ) ((phys_apic) & XAPIC_DEST_CLUSTER_MASK) )
#define APIC_DFR_VALUE (x86_summit ? APIC_DFR_CLUSTER : APIC_DFR_FLAT) #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_DELIVERY_MODE (x86_summit ? dest_Fixed : dest_LowestPrio)
#define INT_DEST_MODE 1 /* logical delivery broadcast to all procs */ #define INT_DEST_MODE 1 /* logical delivery broadcast to all procs */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment