upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 00:32:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a mismerge.

Browse source
This commit is contained in:
Attilio Rao 2011-06-27 13:02:23 +00:00
parent 6b6603b30e
commit c0757daf1f
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sys/kern/subr_kdb.c
View file

@ -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++;