Module Name: src
Committed By: matt
Date: Mon Jun 20 19:56:13 UTC 2011
Modified Files:
src/sys/arch/amigappc/amigappc: locore.S
src/sys/arch/bebox/bebox: locore.S
src/sys/arch/evbppc/ev64260: ev64260_locore.S
src/sys/arch/evbppc/explora: explora_start.S
src/sys/arch/evbppc/obs405: obs200_locore.S obs600_locore.S
src/sys/arch/evbppc/pmppc: pmppc_locore.S
src/sys/arch/evbppc/virtex: virtex_start.S
src/sys/arch/evbppc/walnut: walnut_start.S
src/sys/arch/ibmnws/ibmnws: locore.S
src/sys/arch/macppc/macppc: locore.S
src/sys/arch/mvmeppc/mvmeppc: locore.S
src/sys/arch/ofppc/ofppc: locore.S
src/sys/arch/powerpc/ibm4xx: genassym.cf
src/sys/arch/powerpc/ibm4xx/openbios: locore.S
src/sys/arch/powerpc/oea: genassym.cf
src/sys/arch/prep/prep: locore.S
src/sys/arch/rs6000/rs6000: locore.S
src/sys/arch/sandpoint/sandpoint: locore.S
Log Message:
Don't include *pmap.h in assembly files. Get the needed definitions
from "assym.h".
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/amigappc/amigappc/locore.S
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/bebox/bebox/locore.S
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbppc/ev64260/ev64260_locore.S
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/explora/explora_start.S
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/obs405/obs200_locore.S
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/obs405/obs600_locore.S
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/pmppc/pmppc_locore.S
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/virtex/virtex_start.S
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbppc/walnut/walnut_start.S
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/ibmnws/ibmnws/locore.S
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/macppc/macppc/locore.S
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mvmeppc/mvmeppc/locore.S
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/ofppc/ofppc/locore.S
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/ibm4xx/genassym.cf
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/ibm4xx/openbios/locore.S
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/powerpc/oea/genassym.cf
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/prep/prep/locore.S
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/rs6000/rs6000/locore.S
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sandpoint/sandpoint/locore.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amigappc/amigappc/locore.S
diff -u src/sys/arch/amigappc/amigappc/locore.S:1.23 src/sys/arch/amigappc/amigappc/locore.S:1.24
--- src/sys/arch/amigappc/amigappc/locore.S:1.23 Sat Jun 18 21:17:28 2011
+++ src/sys/arch/amigappc/amigappc/locore.S Mon Jun 20 19:56:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.23 2011/06/18 21:17:28 matt Exp $ */
+/* $NetBSD: locore.S,v 1.24 2011/06/20 19:56:10 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -46,7 +46,6 @@
#include <sys/syscall.h>
#include <machine/param.h>
-#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/trap.h>
#include <machine/asm.h>
Index: src/sys/arch/bebox/bebox/locore.S
diff -u src/sys/arch/bebox/bebox/locore.S:1.23 src/sys/arch/bebox/bebox/locore.S:1.24
--- src/sys/arch/bebox/bebox/locore.S:1.23 Sat Jun 18 21:17:28 2011
+++ src/sys/arch/bebox/bebox/locore.S Mon Jun 20 19:56:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.23 2011/06/18 21:17:28 matt Exp $ */
+/* $NetBSD: locore.S,v 1.24 2011/06/20 19:56:11 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -44,7 +44,6 @@
#include <sys/syscall.h>
#include <machine/param.h>
-#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/trap.h>
#include <machine/asm.h>
Index: src/sys/arch/evbppc/ev64260/ev64260_locore.S
diff -u src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.18 src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.19
--- src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.18 Sat Jun 18 21:17:28 2011
+++ src/sys/arch/evbppc/ev64260/ev64260_locore.S Mon Jun 20 19:56:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ev64260_locore.S,v 1.18 2011/06/18 21:17:28 matt Exp $ */
+/* $NetBSD: ev64260_locore.S,v 1.19 2011/06/20 19:56:11 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -43,7 +43,6 @@
#include <sys/syscall.h>
#include <machine/param.h>
-#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/trap.h>
#include <machine/asm.h>
Index: src/sys/arch/evbppc/explora/explora_start.S
diff -u src/sys/arch/evbppc/explora/explora_start.S:1.9 src/sys/arch/evbppc/explora/explora_start.S:1.10
--- src/sys/arch/evbppc/explora/explora_start.S:1.9 Mon Jun 20 17:44:33 2011
+++ src/sys/arch/evbppc/explora/explora_start.S Mon Jun 20 19:56:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: explora_start.S,v 1.9 2011/06/20 17:44:33 matt Exp $ */
+/* $NetBSD: explora_start.S,v 1.10 2011/06/20 19:56:11 matt Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -49,7 +49,6 @@
#include <powerpc/spr.h>
#include <powerpc/ibm4xx/spr.h>
#include <powerpc/ibm4xx/dcr403cgx.h>
-#include <powerpc/ibm4xx/pmap.h>
#include "opt_ddb.h"
#include "opt_ppcparam.h"
Index: src/sys/arch/evbppc/obs405/obs200_locore.S
diff -u src/sys/arch/evbppc/obs405/obs200_locore.S:1.10 src/sys/arch/evbppc/obs405/obs200_locore.S:1.11
--- src/sys/arch/evbppc/obs405/obs200_locore.S:1.10 Mon Jan 17 08:23:54 2011
+++ src/sys/arch/evbppc/obs405/obs200_locore.S Mon Jun 20 19:56:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obs200_locore.S,v 1.10 2011/01/17 08:23:54 matt Exp $ */
+/* $NetBSD: obs200_locore.S,v 1.11 2011/06/20 19:56:11 matt Exp $ */
/* Original Tag: locore.S,v 1.1 2003/09/23 15:21:58 shige Exp */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
@@ -90,7 +90,6 @@
#include <powerpc/spr.h>
#include <powerpc/ibm4xx/spr.h>
#include <powerpc/ibm4xx/dcr4xx.h>
-#include <powerpc/ibm4xx/pmap.h>
/* Function pointer for requesting board_config_data from OpenBlockS S/R BIOS */
#define BOARD_CFG_FP (0x00100000)
Index: src/sys/arch/evbppc/obs405/obs600_locore.S
diff -u src/sys/arch/evbppc/obs405/obs600_locore.S:1.3 src/sys/arch/evbppc/obs405/obs600_locore.S:1.4
--- src/sys/arch/evbppc/obs405/obs600_locore.S:1.3 Mon Jan 17 08:23:54 2011
+++ src/sys/arch/evbppc/obs405/obs600_locore.S Mon Jun 20 19:56:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obs600_locore.S,v 1.3 2011/01/17 08:23:54 matt Exp $ */
+/* $NetBSD: obs600_locore.S,v 1.4 2011/06/20 19:56:11 matt Exp $ */
/*
* Copyright (c) 2009 KIYOHARA Takashi
@@ -40,7 +40,6 @@
#include <machine/asm.h>
#include <powerpc/ibm4xx/spr.h>
-#include <powerpc/ibm4xx/pmap.h>
/*
* This symbol is here for the benefit of kvm_mkdb, and is supposed to
Index: src/sys/arch/evbppc/pmppc/pmppc_locore.S
diff -u src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.10 src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.11
--- src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.10 Sat Jun 18 21:17:28 2011
+++ src/sys/arch/evbppc/pmppc/pmppc_locore.S Mon Jun 20 19:56:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmppc_locore.S,v 1.10 2011/06/18 21:17:28 matt Exp $ */
+/* $NetBSD: pmppc_locore.S,v 1.11 2011/06/20 19:56:11 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -43,7 +43,6 @@
#include <sys/syscall.h>
#include <machine/param.h>
-#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/trap.h>
#include <machine/asm.h>
Index: src/sys/arch/evbppc/virtex/virtex_start.S
diff -u src/sys/arch/evbppc/virtex/virtex_start.S:1.7 src/sys/arch/evbppc/virtex/virtex_start.S:1.8
--- src/sys/arch/evbppc/virtex/virtex_start.S:1.7 Mon Jan 17 08:23:55 2011
+++ src/sys/arch/evbppc/virtex/virtex_start.S Mon Jun 20 19:56:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: virtex_start.S,v 1.7 2011/01/17 08:23:55 matt Exp $ */
+/* $NetBSD: virtex_start.S,v 1.8 2011/06/20 19:56:11 matt Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -54,7 +54,6 @@
#include <powerpc/spr.h>
#include <powerpc/ibm4xx/spr.h>
#include <powerpc/ibm4xx/dcr4xx.h>
-#include <powerpc/ibm4xx/pmap.h>
/* N megabytes. */
Index: src/sys/arch/evbppc/walnut/walnut_start.S
diff -u src/sys/arch/evbppc/walnut/walnut_start.S:1.21 src/sys/arch/evbppc/walnut/walnut_start.S:1.22
--- src/sys/arch/evbppc/walnut/walnut_start.S:1.21 Mon Jan 17 08:23:55 2011
+++ src/sys/arch/evbppc/walnut/walnut_start.S Mon Jun 20 19:56:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: walnut_start.S,v 1.21 2011/01/17 08:23:55 matt Exp $ */
+/* $NetBSD: walnut_start.S,v 1.22 2011/06/20 19:56:11 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -89,7 +89,6 @@
#include <powerpc/spr.h>
#include <powerpc/ibm4xx/spr.h>
#include <powerpc/ibm4xx/dcr4xx.h>
-#include <powerpc/ibm4xx/pmap.h>
/* Function pointer for requesting board_config_data from openbios*/
#define BOARD_CFG_FP 0xFFFE0B50
Index: src/sys/arch/ibmnws/ibmnws/locore.S
diff -u src/sys/arch/ibmnws/ibmnws/locore.S:1.10 src/sys/arch/ibmnws/ibmnws/locore.S:1.11
--- src/sys/arch/ibmnws/ibmnws/locore.S:1.10 Sat Jun 18 21:17:28 2011
+++ src/sys/arch/ibmnws/ibmnws/locore.S Mon Jun 20 19:56:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.10 2011/06/18 21:17:28 matt Exp $ */
+/* $NetBSD: locore.S,v 1.11 2011/06/20 19:56:11 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -40,7 +40,6 @@
#include <sys/syscall.h>
#include <machine/param.h>
-#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/trap.h>
#include <machine/asm.h>
Index: src/sys/arch/macppc/macppc/locore.S
diff -u src/sys/arch/macppc/macppc/locore.S:1.69 src/sys/arch/macppc/macppc/locore.S:1.70
--- src/sys/arch/macppc/macppc/locore.S:1.69 Sat Jun 18 21:17:28 2011
+++ src/sys/arch/macppc/macppc/locore.S Mon Jun 20 19:56:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.69 2011/06/18 21:17:28 matt Exp $ */
+/* $NetBSD: locore.S,v 1.70 2011/06/20 19:56:12 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -45,7 +45,6 @@
#include <sys/syscall.h>
#include <machine/param.h>
-#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/trap.h>
#include <machine/asm.h>
Index: src/sys/arch/mvmeppc/mvmeppc/locore.S
diff -u src/sys/arch/mvmeppc/mvmeppc/locore.S:1.14 src/sys/arch/mvmeppc/mvmeppc/locore.S:1.15
--- src/sys/arch/mvmeppc/mvmeppc/locore.S:1.14 Sat Jun 18 21:17:29 2011
+++ src/sys/arch/mvmeppc/mvmeppc/locore.S Mon Jun 20 19:56:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.14 2011/06/18 21:17:29 matt Exp $ */
+/* $NetBSD: locore.S,v 1.15 2011/06/20 19:56:12 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -43,7 +43,6 @@
#include <sys/syscall.h>
#include <machine/param.h>
-#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/trap.h>
#include <machine/asm.h>
Index: src/sys/arch/ofppc/ofppc/locore.S
diff -u src/sys/arch/ofppc/ofppc/locore.S:1.47 src/sys/arch/ofppc/ofppc/locore.S:1.48
--- src/sys/arch/ofppc/ofppc/locore.S:1.47 Sat Jun 18 21:17:29 2011
+++ src/sys/arch/ofppc/ofppc/locore.S Mon Jun 20 19:56:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.47 2011/06/18 21:17:29 matt Exp $ */
+/* $NetBSD: locore.S,v 1.48 2011/06/20 19:56:12 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -42,7 +42,6 @@
#include <sys/syscall.h>
#include <machine/param.h>
-#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/trap.h>
#include <machine/asm.h>
Index: src/sys/arch/powerpc/ibm4xx/genassym.cf
diff -u src/sys/arch/powerpc/ibm4xx/genassym.cf:1.22 src/sys/arch/powerpc/ibm4xx/genassym.cf:1.23
--- src/sys/arch/powerpc/ibm4xx/genassym.cf:1.22 Mon Jun 20 17:15:38 2011
+++ src/sys/arch/powerpc/ibm4xx/genassym.cf Mon Jun 20 19:56:12 2011
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.22 2011/06/20 17:15:38 matt Exp $
+# $NetBSD: genassym.cf,v 1.23 2011/06/20 19:56:12 matt Exp $
#
# Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -41,6 +41,7 @@
define FRAME_PID offsetof(struct ktrapframe, ktf_tf.tf_pid)
define PM_CTX offsetof(struct pmap, pm_ctx)
+define KERNEL_PID KERNEL_PID
define CI_INTSTK offsetof(struct cpu_info, ci_intstk)
define CI_TEMPSAVE offsetof(struct cpu_info, ci_savearea[CI_SAVETEMP])
Index: src/sys/arch/powerpc/ibm4xx/openbios/locore.S
diff -u src/sys/arch/powerpc/ibm4xx/openbios/locore.S:1.9 src/sys/arch/powerpc/ibm4xx/openbios/locore.S:1.10
--- src/sys/arch/powerpc/ibm4xx/openbios/locore.S:1.9 Mon Jan 17 08:23:56 2011
+++ src/sys/arch/powerpc/ibm4xx/openbios/locore.S Mon Jun 20 19:56:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.9 2011/01/17 08:23:56 matt Exp $ */
+/* $NetBSD: locore.S,v 1.10 2011/06/20 19:56:12 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -88,7 +88,6 @@
#include <powerpc/spr.h>
#include <powerpc/ibm4xx/spr.h>
-#include <powerpc/ibm4xx/pmap.h>
#include <powerpc/ibm4xx/dcr4xx.h>
/* Function pointer for requesting board_config_data from openbios*/
Index: src/sys/arch/powerpc/oea/genassym.cf
diff -u src/sys/arch/powerpc/oea/genassym.cf:1.24 src/sys/arch/powerpc/oea/genassym.cf:1.25
--- src/sys/arch/powerpc/oea/genassym.cf:1.24 Mon Jun 20 17:15:38 2011
+++ src/sys/arch/powerpc/oea/genassym.cf Mon Jun 20 19:56:12 2011
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.24 2011/06/20 17:15:38 matt Exp $
+# $NetBSD: genassym.cf,v 1.25 2011/06/20 19:56:12 matt Exp $
#
# Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -85,6 +85,11 @@
define OEACPU_HIGHSPRG OEACPU_HIGHSPRG
define OEACPU_ALTIVEC OEACPU_ALTIVEC
+define PTE_REF PTE_REF
+define PTE_CHG PTE_CHG
+define PTE_HID PTE_HID
+define PTE_G PTE_G
+
define FPREG_F0 offsetof(struct fpreg, fpreg[0])
define FPREG_F1 offsetof(struct fpreg, fpreg[1])
define FPREG_F2 offsetof(struct fpreg, fpreg[2])
Index: src/sys/arch/prep/prep/locore.S
diff -u src/sys/arch/prep/prep/locore.S:1.17 src/sys/arch/prep/prep/locore.S:1.18
--- src/sys/arch/prep/prep/locore.S:1.17 Sat Jun 18 21:17:30 2011
+++ src/sys/arch/prep/prep/locore.S Mon Jun 20 19:56:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.17 2011/06/18 21:17:30 matt Exp $ */
+/* $NetBSD: locore.S,v 1.18 2011/06/20 19:56:12 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -43,7 +43,6 @@
#include <sys/syscall.h>
#include <machine/param.h>
-#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/trap.h>
#include <machine/asm.h>
Index: src/sys/arch/rs6000/rs6000/locore.S
diff -u src/sys/arch/rs6000/rs6000/locore.S:1.9 src/sys/arch/rs6000/rs6000/locore.S:1.10
--- src/sys/arch/rs6000/rs6000/locore.S:1.9 Sat Jun 18 21:17:30 2011
+++ src/sys/arch/rs6000/rs6000/locore.S Mon Jun 20 19:56:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.9 2011/06/18 21:17:30 matt Exp $ */
+/* $NetBSD: locore.S,v 1.10 2011/06/20 19:56:13 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -43,7 +43,6 @@
#include <sys/syscall.h>
#include <machine/param.h>
-#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/trap.h>
#include <machine/asm.h>
Index: src/sys/arch/sandpoint/sandpoint/locore.S
diff -u src/sys/arch/sandpoint/sandpoint/locore.S:1.22 src/sys/arch/sandpoint/sandpoint/locore.S:1.23
--- src/sys/arch/sandpoint/sandpoint/locore.S:1.22 Sat Jun 18 21:17:30 2011
+++ src/sys/arch/sandpoint/sandpoint/locore.S Mon Jun 20 19:56:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.22 2011/06/18 21:17:30 matt Exp $ */
+/* $NetBSD: locore.S,v 1.23 2011/06/20 19:56:13 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -43,7 +43,6 @@
#include <sys/syscall.h>
#include <machine/param.h>
-#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/trap.h>
#include <machine/asm.h>
