From owner-p4-projects  Mon Oct 28 10:58:50 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 622D737B404; Mon, 28 Oct 2002 10:58:48 -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 0E2E537B401
	for <perforce@freebsd.org>; Mon, 28 Oct 2002 10:58:48 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C17C143E6E
	for <perforce@freebsd.org>; Mon, 28 Oct 2002 10:58:47 -0800 (PST)
	(envelope-from jhb@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 g9SIvgmV018905
	for <perforce@freebsd.org>; Mon, 28 Oct 2002 10:57:42 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9SIvfqW018902
	for perforce@freebsd.org; Mon, 28 Oct 2002 10:57:41 -0800 (PST)
Date: Mon, 28 Oct 2002 10:57:41 -0800 (PST)
Message-Id: <200210281857.g9SIvfqW018902@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 20293 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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

Change 20293 by jhb@jhb_laptop on 2002/10/28 10:57:04

	IFC these two files.

Affected files ...

.. //depot/projects/smpng/sys/alpha/include/alpha_cpu.h#5 integrate
.. //depot/projects/smpng/sys/alpha/include/atomic.h#5 integrate

Differences ...

==== //depot/projects/smpng/sys/alpha/include/alpha_cpu.h#5 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/alpha_cpu.h,v 1.8 2001/04/21 21:44:39 gallatin Exp $ */
+/* $FreeBSD: src/sys/alpha/include/alpha_cpu.h,v 1.9 2002/10/25 20:22:12 jhb Exp $ */
 /* From: NetBSD: alpha_cpu.h,v 1.15 1997/09/20 19:02:34 mjacob Exp */
 
 /*

==== //depot/projects/smpng/sys/alpha/include/atomic.h#5 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.15 2002/09/21 19:12:59 markm Exp $
+ * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.16 2002/10/25 20:22:12 jhb Exp $
  */
 
 #ifndef _MACHINE_ATOMIC_H_

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message