diff options
| author | Attilio Rao <attilio@FreeBSD.org> | 2011-06-27 13:02:23 +0000 |
|---|---|---|
| committer | Attilio Rao <attilio@FreeBSD.org> | 2011-06-27 13:02:23 +0000 |
| commit | c0757daf1fdc2e8c7de4177d57de7dc8e6ff577b (patch) | |
| tree | 83b8fcfb8d821c5f9f87e556d03c60e315b03994 /sys/kern | |
| parent | 6b6603b30e7e42791843b0f6848ae3793f9b8f68 (diff) | |
| download | src-c0757daf1fdc2e8c7de4177d57de7dc8e6ff577b.tar.gz src-c0757daf1fdc2e8c7de4177d57de7dc8e6ff577b.zip | |
Fix a mismerge.
Notes
Notes:
svn path=/projects/largeSMP/; revision=223595
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/subr_kdb.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sys/kern/subr_kdb.c b/sys/kern/subr_kdb.c index a7b3b8380b1d..f5cb31e71dd6 100644 --- a/sys/kern/subr_kdb.c +++ b/sys/kern/subr_kdb.c @@ -502,12 +502,11 @@ kdb_thr_select(struct thread *thr) int kdb_trap(int type, int code, struct trapframe *tf) { - struct kdb_dbbe *be; - register_t intr; #ifdef SMP cpuset_t other_cpus; - int did_stop_cpus; #endif + struct kdb_dbbe *be; + register_t intr; int handled; be = kdb_dbbe; @@ -521,11 +520,9 @@ kdb_trap(int type, int code, struct trapframe *tf) intr = intr_disable(); #ifdef SMP - if ((did_stop_cpus = kdb_stop_cpus) != 0) { - other_cpus = all_cpus; - CPU_CLR(PCPU_GET(cpuid), &other_cpus); - stop_cpus_hard(other_cpus); - } + other_cpus = all_cpus; + CPU_CLR(PCPU_GET(cpuid), &other_cpus); + stop_cpus_hard(other_cpus); #endif kdb_active++; |