From owner-p4-projects@FreeBSD.ORG  Mon Apr 28 16:22:25 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 336CB37B405; Mon, 28 Apr 2003 16:22:25 -0700 (PDT)
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 CA4E637B401
	for <perforce@freebsd.org>; Mon, 28 Apr 2003 16:22:24 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0BA0743FB1
	for <perforce@freebsd.org>; Mon, 28 Apr 2003 16:22:24 -0700 (PDT)
	(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 h3SNMN0U086628
	for <perforce@freebsd.org>; Mon, 28 Apr 2003 16:22:23 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SNMN5G086621
	for perforce@freebsd.org; Mon, 28 Apr 2003 16:22:23 -0700 (PDT)
Date: Mon, 28 Apr 2003 16:22:23 -0700 (PDT)
Message-Id: <200304282322.h3SNMN5G086621@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 30004 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, 28 Apr 2003 23:22:26 -0000

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

Change 30004 by peter@peter_overcee on 2003/04/28 16:22:11

	s/x86_64/amd64/

Affected files ...

.. //depot/projects/hammer/sys/x86_64/include/param.h#11 edit
.. //depot/projects/hammer/sys/x86_64/include/pmap.h#18 edit
.. //depot/projects/hammer/sys/x86_64/include/tss.h#9 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/include/param.h#11 (text+ko) ====

@@ -65,10 +65,10 @@
 #endif
 
 #ifndef _MACHINE
-#define	_MACHINE	x86_64
+#define	_MACHINE	amd64
 #endif
 #ifndef _MACHINE_ARCH
-#define	_MACHINE_ARCH	x86_64
+#define	_MACHINE_ARCH	amd64
 #endif
 
 #ifndef _NO_NAMESPACE_POLLUTION
@@ -77,10 +77,10 @@
 #define	_MACHINE_PARAM_H_
 
 #ifndef MACHINE
-#define	MACHINE		"x86_64"
+#define	MACHINE		"amd64"
 #endif
 #ifndef MACHINE_ARCH
-#define	MACHINE_ARCH	"x86_64"
+#define	MACHINE_ARCH	"amd64"
 #endif
 #define	MID_MACHINE	MID_X86_64
 

==== //depot/projects/hammer/sys/x86_64/include/pmap.h#18 (text+ko) ====

@@ -165,7 +165,7 @@
  * Note: these work recursively, thus vtopte of a pte will give
  * the corresponding pde that in turn maps it.
  */
-#define	vtopte(va)	(PTmap + x86_64_btop(va))
+#define	vtopte(va)	(PTmap + amd64_btop(va))
 
 /*
  *	Routine:	pmap_kextract

==== //depot/projects/hammer/sys/x86_64/include/tss.h#9 (text+ko) ====

@@ -41,13 +41,13 @@
 #define _MACHINE_TSS_H_ 1
 
 /*
- * x86-64 Context Data Type
+ * amd64 Context Data Type
  *
  * The alignment is pretty messed up here due to reuse of the original 32 bit
  * fields.  It might be worth trying to set the tss on a +4 byte offset to
  * make the 64 bit fields aligned in practice.
  */
-struct x86_64tss {
+struct amd64tss {
 	u_int32_t	tss_rsvd0;
 	u_int64_t	tss_rsp0 __packed; 	/* kernel stack pointer ring 0 */
 	u_int64_t	tss_rsp1 __packed; 	/* kernel stack pointer ring 1 */
@@ -69,7 +69,7 @@
 };
 
 #ifdef _KERNEL
-extern struct x86_64tss common_tss;
+extern struct amd64tss common_tss;
 #endif
 
 #endif /* _MACHINE_TSS_H_ */