From owner-p4-projects@FreeBSD.ORG  Sat Jan 19 21:56:33 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2402216A420; Sat, 19 Jan 2008 21:56:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C51ED16A41A
	for <perforce@freebsd.org>; Sat, 19 Jan 2008 21:56:32 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C613613C4D3
	for <perforce@freebsd.org>; Sat, 19 Jan 2008 21:56:32 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0JLuW41096564
	for <perforce@freebsd.org>; Sat, 19 Jan 2008 21:56:32 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0JLuUCc096561
	for perforce@freebsd.org; Sat, 19 Jan 2008 21:56:30 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 19 Jan 2008 21:56:30 GMT
Message-Id: <200801192156.m0JLuUCc096561@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 133681 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 19 Jan 2008 21:56:33 -0000

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

Change 133681 by jb@jb_freebsd1 on 2008/01/19 21:56:06

	Reset to match CVS.

Affected files ...

.. //depot/projects/dtrace/src/sys/sparc64/include/asi.h#6 edit
.. //depot/projects/dtrace/src/sys/sparc64/include/asm.h#5 edit

Differences ...

==== //depot/projects/dtrace/src/sys/sparc64/include/asi.h#6 (text+ko) ====

@@ -49,11 +49,6 @@
 #define	ASI_SL					0x89
 #define	ASI_PNFL				0x8a
 #define	ASI_SNFL				0x8b
- 
-/*
- * Mnemonic asis
- */
-#define ASI_USER        ASI_AIUS
 
 /*
  * UltraSPARC extensions. ASIs limited to a certain family are annotated.

==== //depot/projects/dtrace/src/sys/sparc64/include/asm.h#5 (text+ko) ====

@@ -93,16 +93,8 @@
 CNAME(x):
 
 #define	ENTRY(x)	_ENTRY(x)
-#define	ENTRY_NP(x)	_ENTRY(x)
 #define	END(x)		.size x, . - x
 
-#define STACK_ALIGN     16
-#define SET_SIZE(x)     END(x)
-#define SA(X)           (((X)+(STACK_ALIGN-1)) & ~(STACK_ALIGN-1))  
-#define WINDOWSIZE64    (16*8)
-#define WINDOWSIZE	WINDOWSIZE64
-#define MINFRAME64      (WINDOWSIZE64 + 48)
-#define MINFRAME        MINFRAME64
 /*
  * Kernel RCS ID tag and copyright macros
  */