From 6265330aa092be1248da9e4c807df03121923d37 Mon Sep 17 00:00:00 2001 From: matt Date: Mon, 20 Jun 2011 19:56:10 +0000 Subject: [PATCH] Don't include *pmap.h in assembly files. Get the needed definitions from "assym.h". --- sys/arch/amigappc/amigappc/locore.S | 3 +-- sys/arch/bebox/bebox/locore.S | 3 +-- sys/arch/evbppc/ev64260/ev64260_locore.S | 3 +-- sys/arch/evbppc/explora/explora_start.S | 3 +-- sys/arch/evbppc/obs405/obs200_locore.S | 3 +-- sys/arch/evbppc/obs405/obs600_locore.S | 3 +-- sys/arch/evbppc/pmppc/pmppc_locore.S | 3 +-- sys/arch/evbppc/virtex/virtex_start.S | 3 +-- sys/arch/evbppc/walnut/walnut_start.S | 3 +-- sys/arch/ibmnws/ibmnws/locore.S | 3 +-- sys/arch/macppc/macppc/locore.S | 3 +-- sys/arch/mvmeppc/mvmeppc/locore.S | 3 +-- sys/arch/ofppc/ofppc/locore.S | 3 +-- sys/arch/powerpc/ibm4xx/genassym.cf | 3 ++- sys/arch/powerpc/ibm4xx/openbios/locore.S | 3 +-- sys/arch/powerpc/oea/genassym.cf | 7 ++++++- sys/arch/prep/prep/locore.S | 3 +-- sys/arch/rs6000/rs6000/locore.S | 3 +-- sys/arch/sandpoint/sandpoint/locore.S | 3 +-- 19 files changed, 25 insertions(+), 36 deletions(-) diff --git a/sys/arch/amigappc/amigappc/locore.S b/sys/arch/amigappc/amigappc/locore.S index bf83a39fc60d..22d5f670a007 100644 --- a/sys/arch/amigappc/amigappc/locore.S +++ b/sys/arch/amigappc/amigappc/locore.S @@ -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 #include -#include #include #include #include diff --git a/sys/arch/bebox/bebox/locore.S b/sys/arch/bebox/bebox/locore.S index 1241eb598841..3ac183f420ae 100644 --- a/sys/arch/bebox/bebox/locore.S +++ b/sys/arch/bebox/bebox/locore.S @@ -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 #include -#include #include #include #include diff --git a/sys/arch/evbppc/ev64260/ev64260_locore.S b/sys/arch/evbppc/ev64260/ev64260_locore.S index 6b88348cd6fb..862f320407ca 100644 --- a/sys/arch/evbppc/ev64260/ev64260_locore.S +++ b/sys/arch/evbppc/ev64260/ev64260_locore.S @@ -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 #include -#include #include #include #include diff --git a/sys/arch/evbppc/explora/explora_start.S b/sys/arch/evbppc/explora/explora_start.S index 0d938fa7195a..be5367519f83 100644 --- a/sys/arch/evbppc/explora/explora_start.S +++ b/sys/arch/evbppc/explora/explora_start.S @@ -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 #include #include -#include #include "opt_ddb.h" #include "opt_ppcparam.h" diff --git a/sys/arch/evbppc/obs405/obs200_locore.S b/sys/arch/evbppc/obs405/obs200_locore.S index af9f49f499a3..db04782ee918 100644 --- a/sys/arch/evbppc/obs405/obs200_locore.S +++ b/sys/arch/evbppc/obs405/obs200_locore.S @@ -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 #include #include -#include /* Function pointer for requesting board_config_data from OpenBlockS S/R BIOS */ #define BOARD_CFG_FP (0x00100000) diff --git a/sys/arch/evbppc/obs405/obs600_locore.S b/sys/arch/evbppc/obs405/obs600_locore.S index 616f696179e0..1f76b4de0775 100644 --- a/sys/arch/evbppc/obs405/obs600_locore.S +++ b/sys/arch/evbppc/obs405/obs600_locore.S @@ -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 #include -#include /* * This symbol is here for the benefit of kvm_mkdb, and is supposed to diff --git a/sys/arch/evbppc/pmppc/pmppc_locore.S b/sys/arch/evbppc/pmppc/pmppc_locore.S index b397f2607845..a287696f5bcb 100644 --- a/sys/arch/evbppc/pmppc/pmppc_locore.S +++ b/sys/arch/evbppc/pmppc/pmppc_locore.S @@ -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 #include -#include #include #include #include diff --git a/sys/arch/evbppc/virtex/virtex_start.S b/sys/arch/evbppc/virtex/virtex_start.S index 9ca077026331..68821492b32b 100644 --- a/sys/arch/evbppc/virtex/virtex_start.S +++ b/sys/arch/evbppc/virtex/virtex_start.S @@ -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 #include #include -#include /* N megabytes. */ diff --git a/sys/arch/evbppc/walnut/walnut_start.S b/sys/arch/evbppc/walnut/walnut_start.S index 38fcb2828231..79649794518b 100644 --- a/sys/arch/evbppc/walnut/walnut_start.S +++ b/sys/arch/evbppc/walnut/walnut_start.S @@ -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 #include #include -#include /* Function pointer for requesting board_config_data from openbios*/ #define BOARD_CFG_FP 0xFFFE0B50 diff --git a/sys/arch/ibmnws/ibmnws/locore.S b/sys/arch/ibmnws/ibmnws/locore.S index fb80bbb2df21..3e1094a5ba87 100644 --- a/sys/arch/ibmnws/ibmnws/locore.S +++ b/sys/arch/ibmnws/ibmnws/locore.S @@ -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 #include -#include #include #include #include diff --git a/sys/arch/macppc/macppc/locore.S b/sys/arch/macppc/macppc/locore.S index 32b016a2c194..1f8b06f270da 100644 --- a/sys/arch/macppc/macppc/locore.S +++ b/sys/arch/macppc/macppc/locore.S @@ -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 #include -#include #include #include #include diff --git a/sys/arch/mvmeppc/mvmeppc/locore.S b/sys/arch/mvmeppc/mvmeppc/locore.S index 9ad21ccb77c9..6db7aa078814 100644 --- a/sys/arch/mvmeppc/mvmeppc/locore.S +++ b/sys/arch/mvmeppc/mvmeppc/locore.S @@ -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 #include -#include #include #include #include diff --git a/sys/arch/ofppc/ofppc/locore.S b/sys/arch/ofppc/ofppc/locore.S index 727c441dbdd5..ed14aec00717 100644 --- a/sys/arch/ofppc/ofppc/locore.S +++ b/sys/arch/ofppc/ofppc/locore.S @@ -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 #include -#include #include #include #include diff --git a/sys/arch/powerpc/ibm4xx/genassym.cf b/sys/arch/powerpc/ibm4xx/genassym.cf index 700b735847d7..de37e10477de 100644 --- a/sys/arch/powerpc/ibm4xx/genassym.cf +++ b/sys/arch/powerpc/ibm4xx/genassym.cf @@ -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_ESR offsetof(struct ktrapframe, ktf_tf.tf_esr) 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]) diff --git a/sys/arch/powerpc/ibm4xx/openbios/locore.S b/sys/arch/powerpc/ibm4xx/openbios/locore.S index 1d527fe22850..f1650345190a 100644 --- a/sys/arch/powerpc/ibm4xx/openbios/locore.S +++ b/sys/arch/powerpc/ibm4xx/openbios/locore.S @@ -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 #include -#include #include /* Function pointer for requesting board_config_data from openbios*/ diff --git a/sys/arch/powerpc/oea/genassym.cf b/sys/arch/powerpc/oea/genassym.cf index ca34b21e2ab8..6b8355c34f41 100644 --- a/sys/arch/powerpc/oea/genassym.cf +++ b/sys/arch/powerpc/oea/genassym.cf @@ -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_601 OEACPU_601 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]) diff --git a/sys/arch/prep/prep/locore.S b/sys/arch/prep/prep/locore.S index c298323af1f6..c32f02a84a16 100644 --- a/sys/arch/prep/prep/locore.S +++ b/sys/arch/prep/prep/locore.S @@ -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 #include -#include #include #include #include diff --git a/sys/arch/rs6000/rs6000/locore.S b/sys/arch/rs6000/rs6000/locore.S index 907dd3603cad..eb4709963a2c 100644 --- a/sys/arch/rs6000/rs6000/locore.S +++ b/sys/arch/rs6000/rs6000/locore.S @@ -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 #include -#include #include #include #include diff --git a/sys/arch/sandpoint/sandpoint/locore.S b/sys/arch/sandpoint/sandpoint/locore.S index c0a01653a357..65f86fa40978 100644 --- a/sys/arch/sandpoint/sandpoint/locore.S +++ b/sys/arch/sandpoint/sandpoint/locore.S @@ -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 #include -#include #include #include #include