From owner-svn-src-projects@FreeBSD.ORG  Mon Jun 27 13:02:23 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B8E561065670;
	Mon, 27 Jun 2011 13:02:23 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A9A5B8FC08;
	Mon, 27 Jun 2011 13:02:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5RD2NFb098708;
	Mon, 27 Jun 2011 13:02:23 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5RD2NmU098706;
	Mon, 27 Jun 2011 13:02:23 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201106271302.p5RD2NmU098706@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Mon, 27 Jun 2011 13:02:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223595 - projects/largeSMP/sys/kern
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Jun 2011 13:02:23 -0000

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