From owner-p4-projects@FreeBSD.ORG  Tue Mar  2 13:43:10 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 04A5516A4D0; Tue,  2 Mar 2004 13:43:10 -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 D21EB16A4CE
	for <perforce@freebsd.org>; Tue,  2 Mar 2004 13:43:09 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CCF5243D41
	for <perforce@freebsd.org>; Tue,  2 Mar 2004 13:43:09 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i22Lh9Ge034819
	for <perforce@freebsd.org>; Tue, 2 Mar 2004 13:43:09 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i22Lh9bL034816
	for perforce@freebsd.org; Tue, 2 Mar 2004 13:43:09 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Tue, 2 Mar 2004 13:43:09 -0800 (PST)
Message-Id: <200403022143.i22Lh9bL034816@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 48015 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: Tue, 02 Mar 2004 21:43:10 -0000

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

Change 48015 by peter@peter_daintree on 2004/03/02 13:42:11

	clean up after merge errors

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#22 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#22 (text+ko) ====

@@ -42,12 +42,6 @@
 
 #include "assym.s"
 
-#ifdef SMP
-#define LK	lock ;
-#else
-#define LK
-#endif
-
 /*****************************************************************************/
 /* Scheduling                                                                */
 /*****************************************************************************/