Conflicts with cpumask_t, and is crap anyway.
arch/i386/kernel/kgdb_stub.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff -puN arch/i386/kernel/kgdb_stub.c~kgdb-remove-cpu_callout_map arch/i386/kernel/kgdb_stub.c
--- 25/arch/i386/kernel/kgdb_stub.c~kgdb-remove-cpu_callout_map 2003-07-04 22:15:57.000000000 -0700
+++ 25-akpm/arch/i386/kernel/kgdb_stub.c 2003-07-04 22:16:28.000000000 -0700
@@ -195,7 +195,6 @@ void smp_send_nmi_allbutself(void);
#define hold_init hold_on_sstep: 1,
#define MAX_CPU_MASK (unsigned long)((1LL << MAX_NO_CPUS) - 1LL)
#define NUM_CPUS num_online_cpus()
-extern volatile unsigned long cpu_callout_map;
#else
#define IF_SMP(x)
#define hold_init
@@ -355,7 +354,6 @@ static int spinlock_cpu = 0;
spinlock_count++; \
}
#define KGDB_SPIN_UNLOCK(x) if( --spinlock_count == 0) spin_unlock(x)
-extern volatile unsigned long cpu_callout_map;
#else
unsigned kgdb_spinlock = 0;
#define KGDB_SPIN_LOCK(x) --*x
@@ -1160,6 +1158,7 @@ kgdb_handle_exception(int exceptionVecto
*/
#ifdef CONFIG_SMP
+#if 0
if (cpu_callout_map & ~MAX_CPU_MASK) {
printk("kgdb : too many cpus, possibly not mapped"
" in contiguous space, change MAX_NO_CPUS"
@@ -1167,7 +1166,7 @@ kgdb_handle_exception(int exceptionVecto
" cpu_callout_map is %lx\n", cpu_callout_map);
goto exit_just_unlock;
}
-
+#endif
if (spinlock_count == 1) {
int time, end_time, dum;
int i;
@@ -1857,7 +1856,9 @@ kgdb_handle_exception(int exceptionVecto
kgdb_local_irq_restore(flags);
return (0);
}
- exit_just_unlock:
+#if 0
+exit_just_unlock:
+#endif
#endif
/* Release kgdb spinlock */
KGDB_SPIN_UNLOCK(&kgdb_spinlock);
_