Don't include *pmap.h in assembly files. Get the needed definitions
from "assym.h".
This commit is contained in:
parent
5ac6884491
commit
6265330aa0
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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. */
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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])
|
||||
|
|
|
@ -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*/
|
||||
|
|
|
@ -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])
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue