From owner-p4-projects@FreeBSD.ORG  Fri Apr  4 18:26:58 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2F95237B404; Fri,  4 Apr 2003 18:26:58 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B920737B401
	for <perforce@freebsd.org>; Fri,  4 Apr 2003 18:26:57 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6237B43FBD
	for <perforce@freebsd.org>; Fri,  4 Apr 2003 18:26:57 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h352Qv0U094235
	for <perforce@freebsd.org>; Fri, 4 Apr 2003 18:26:57 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h352Qul8094232
	for perforce@freebsd.org; Fri, 4 Apr 2003 18:26:56 -0800 (PST)
Date: Fri, 4 Apr 2003 18:26:56 -0800 (PST)
Message-Id: <200304050226.h352Qul8094232@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 28133 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Apr 2003 02:26:59 -0000

http://perforce.freebsd.org/chv.cgi?CH=28133

Change 28133 by peter@peter_daintree on 2003/04/04 18:26:46

	Some SMP stuff snuck back in

Affected files ...

.. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#34 edit
.. //depot/projects/hammer/sys/x86_64/x86_64/support.s#7 edit
.. //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#12 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#34 (text+ko) ====

@@ -440,11 +440,6 @@
 cpu_idle(void)
 {
 
-#ifdef SMP
-	if (mp_grab_cpu_hlt())
-		return;
-#endif
-
 	if (cpu_idle_hlt) {
 		disable_intr();
   		if (sched_runnable()) {

==== //depot/projects/hammer/sys/x86_64/x86_64/support.s#7 (text+ko) ====

@@ -376,11 +376,7 @@
 	cmpl	$VM_MAXUSER_ADDRESS-4,%edx	/* verify address is valid */
 	ja	fusufault
 
-#if defined(SMP)
-	lock cmpxchgl %ecx, (%edx)		/* Compare and set. */
-#else	/* !SMP */
 	cmpxchgl %ecx, (%edx)
-#endif	/* !SMP */
 
 	/*
 	 * The old value is in %eax.  If the store succeeded it will be the

==== //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#12 (text+ko) ====

@@ -57,7 +57,6 @@
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/mutex.h>
-#include <sys/smp.h>
 #include <sys/sysctl.h>
 #include <sys/unistd.h>