From owner-p4-projects@FreeBSD.ORG  Mon Dec  1 13:11:20 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1DE3C16A4D1; Mon,  1 Dec 2003 13:11:20 -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 EC39916A4CE
	for <perforce@freebsd.org>; Mon,  1 Dec 2003 13:11:19 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E611043FDD
	for <perforce@freebsd.org>; Mon,  1 Dec 2003 13:11:18 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB1LBIXJ067940
	for <perforce@freebsd.org>; Mon, 1 Dec 2003 13:11:18 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB1LBIKF067937
	for perforce@freebsd.org; Mon, 1 Dec 2003 13:11:18 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Mon, 1 Dec 2003 13:11:18 -0800 (PST)
Message-Id: <200312012111.hB1LBIKF067937@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 43248 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: Mon, 01 Dec 2003 21:11:20 -0000

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

Change 43248 by peter@peter_daintree on 2003/12/01 13:10:58

	MTX_LOCK_SPIN and MTX_UNLOCK_SPIN are not used.. kill the broken definitions of them.
	XXX also appears to be unused on i386.

Affected files ...

.. //depot/projects/hammer/sys/amd64/include/mutex.h#6 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/include/mutex.h#6 (text+ko) ====

@@ -33,7 +33,6 @@
 #define _MACHINE_MUTEX_H_
 
 #ifndef LOCORE
-
 #ifdef _KERNEL
 
 /* Global locks */
@@ -41,35 +40,5 @@
 
 #endif	/* _KERNEL */
 
-#else	/* !LOCORE */
-
-/*
- * Simple assembly macros to get and release mutexes.
- *
- * Note: All of these macros accept a "flags" argument and are analoguous
- *	 to the mtx_lock_flags and mtx_unlock_flags general macros. If one
- *	 desires to not pass a flag, the value 0 may be passed as second
- *	 argument.
- *
- * XXX: We only have MTX_LOCK_SPIN and MTX_UNLOCK_SPIN for now, since that's
- *	all we use right now. We should add MTX_LOCK and MTX_UNLOCK (for sleep
- *	locks) in the near future, however.
- */
-#define MTX_LOCK_SPIN(lck, flags)					\
-	pushq $0 ;							\
-	pushq $0 ;							\
-	pushq $flags ;							\
-	pushq $lck ;							\
-	call _mtx_lock_spin_flags ;					\
-	addq $0x20, %rsp ;						\
-
-#define MTX_UNLOCK_SPIN(lck)						\
-	pushq $0 ;							\
-	pushq $0 ;							\
-	pushq $0 ;							\
-	pushq $lck ;							\
-	call _mtx_unlock_spin_flags ;					\
-	addq $0x20, %rsp ;						\
-
 #endif	/* !LOCORE */
 #endif	/* __MACHINE_MUTEX_H */