Date: Mon, 27 Jun 2011 13:02:23 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r223595 - projects/largeSMP/sys/kern Message-ID: <201106271302.p5RD2NmU098706@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Mon Jun 27 13:02:23 2011 New Revision: 223595 URL: http://svn.freebsd.org/changeset/base/223595 Log: Fix a mismerge. Modified: projects/largeSMP/sys/kern/subr_kdb.c Modified: projects/largeSMP/sys/kern/subr_kdb.c ============================================================================== --- projects/largeSMP/sys/kern/subr_kdb.c Mon Jun 27 12:42:48 2011 (r223594) +++ projects/largeSMP/sys/kern/subr_kdb.c Mon Jun 27 13:02:23 2011 (r223595) @@ -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 trap 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++;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106271302.p5RD2NmU098706>