Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/i386/i386/genassym.cf,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/i386/i386/genassym.cf,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.50
retrieving revision 1.50.2.3
diff -u -p -r1.50 -r1.50.2.3
--- src/sys/arch/i386/i386/genassym.cf	2007/08/29 23:38:04	1.50
+++ src/sys/arch/i386/i386/genassym.cf	2007/10/06 15:34:51	1.50.2.3
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.50 2007/08/29 23:38:04 ad Exp $
+#	$NetBSD: genassym.cf,v 1.50.2.3 2007/10/06 15:34:51 yamt Exp $
 
 #
 # Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -150,6 +150,8 @@ endif
 
 include <machine/tlog.h>
 
+include <x86/busdefs.h>
+
 define	PAGE_SIZE		PAGE_SIZE
 
 define	LSRUN			LSRUN
@@ -162,22 +164,16 @@ define	KSTACK_SIZE		KSTACK_SIZE
 define	KERNBASE		KERNBASE
 define	KERNTEXTOFF		KERNTEXTOFF
 
-define	PGSHIFT			PGSHIFT
-define	PGOFSET			PGOFSET
-define	PDSHIFT			PDSHIFT
-define	PDOFSET			PDOFSET
-define	NBPD			NBPD
-
 define	PG_RW			PG_RW
 define	PG_V			PG_V
 define	PG_KW			PG_KW
 define	PG_KR			PG_KR
 
-define	PDSLOT_PTE		PDSLOT_PTE
-define	PDSLOT_APTE		PDSLOT_APTE
-define	PDSLOT_KERN		PDSLOT_KERN
-define	NKPTP_MIN		NKPTP_MIN
-define	NKPTP_MAX		NKPTP_MAX
+define	L2_SLOT_KERNBASE	pl2_pi(KERNBASE)
+define	L1_SLOT_KERNBASE	pl1_pi(KERNBASE)
+
+define	PDIR_SLOT_PTE		PDIR_SLOT_PTE
+define	PTE_BASE		PTE_BASE
 
 define	VM_MAXUSER_ADDRESS	(int)VM_MAXUSER_ADDRESS
 
@@ -290,7 +286,6 @@ define	TLBSTATE_LAZY		TLBSTATE_LAZY
 define	TLBSTATE_STALE		TLBSTATE_STALE
 define	CPU_INFO_TLB_EVCNT	offsetof(struct cpu_info, ci_tlb_evcnt)
 define	CPU_INFO_CURLWP		offsetof(struct cpu_info, ci_curlwp)
-define	CPU_INFO_ASTPENDING	offsetof(struct cpu_info, ci_astpending)
 define	CPU_INFO_IDLELWP	offsetof(struct cpu_info, ci_data.cpu_idlelwp)
 define	CPU_INFO_PMAP		offsetof(struct cpu_info, ci_pmap)
 define	CPU_INFO_CPUMASK	offsetof(struct cpu_info, ci_cpumask)
@@ -402,3 +397,13 @@ define	MB_TAIL			offsetof(struct pmap_mb
 define	PM_CPUS			offsetof(struct pmap, pm_cpus)
 
 define	EV_COUNT		offsetof(struct evcnt, ev_count)
+
+define	OPTERON_MSR_PASSCODE	OPTERON_MSR_PASSCODE
+
+define	X86_BUS_SPACE_IO	X86_BUS_SPACE_IO
+
+define	L1_SHIFT		L1_SHIFT
+define	L2_SHIFT		L2_SHIFT
+define	L2_FRAME		L2_FRAME
+define	PGOFSET			PGOFSET
+define	PGSHIFT			PGSHIFT