summaryrefslogtreecommitdiff
path: root/sys/arch/pica/include
diff options
context:
space:
mode:
authorPer Fogelstrom <pefo@cvs.openbsd.org>1996-05-02 07:59:44 +0000
committerPer Fogelstrom <pefo@cvs.openbsd.org>1996-05-02 07:59:44 +0000
commit9f342a263a034240260660e71be9f97f04d140a5 (patch)
treec46311670c407c3ab07d401f7b5d827d6482614b /sys/arch/pica/include
parentb5041247fa98bb177ddcc3858525941d29794c1f (diff)
Updated for new config etc.
Diffstat (limited to 'sys/arch/pica/include')
-rw-r--r--sys/arch/pica/include/param.h4
-rw-r--r--sys/arch/pica/include/pte.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/pica/include/param.h b/sys/arch/pica/include/param.h
index 60773bc1eb0..10f068449c1 100644
--- a/sys/arch/pica/include/param.h
+++ b/sys/arch/pica/include/param.h
@@ -39,7 +39,7 @@
*
*
* from: @(#)param.h 8.1 (Berkeley) 6/10/93
- * $Id: param.h,v 1.2 1995/10/22 06:26:07 deraadt Exp $
+ * $Id: param.h,v 1.3 1996/05/02 07:59:39 pefo Exp $
*/
/*
@@ -144,7 +144,7 @@
#define pica_ptob(x) ((unsigned)(x) << PGSHIFT)
#ifdef _KERNEL
-#ifndef LOCORE
+#ifndef _LOCORE
extern int (*Mach_splnet)(), (*Mach_splbio)(), (*Mach_splimp)(),
(*Mach_spltty)(), (*Mach_splclock)(), (*Mach_splstatclock)();
#define splnet() ((*Mach_splnet)())
diff --git a/sys/arch/pica/include/pte.h b/sys/arch/pica/include/pte.h
index bf73a1f6974..898b653b7ec 100644
--- a/sys/arch/pica/include/pte.h
+++ b/sys/arch/pica/include/pte.h
@@ -38,14 +38,14 @@
* from: Utah Hdr: pte.h 1.11 89/09/03
*
* from: @(#)pte.h 8.1 (Berkeley) 6/10/93
- * $Id: pte.h,v 1.1 1995/10/18 10:39:13 deraadt Exp $
+ * $Id: pte.h,v 1.2 1996/05/02 07:59:40 pefo Exp $
*/
/*
* R4000 hardware page table entry
*/
-#ifndef LOCORE
+#ifndef _LOCORE
struct pte {
#if BYTE_ORDER == BIG_ENDIAN
unsigned int pg_prot:2, /* SW: access control */
@@ -80,7 +80,7 @@ typedef union pt_entry {
unsigned int pt_entry; /* for copying, etc. */
struct pte pt_pte; /* for getting to bits by name */
} pt_entry_t; /* Mach page table entry */
-#endif /* LOCORE */
+#endif /* _LOCORE */
#define PT_ENTRY_NULL ((pt_entry_t *) 0)
@@ -120,7 +120,7 @@ typedef union pt_entry {
#define PG_SIZE_4M 0x007fe000
#define PG_SIZE_16M 0x01ffe000
-#if defined(_KERNEL) && !defined(LOCORE)
+#if defined(_KERNEL) && !defined(_LOCORE)
/*
* Kernel virtual address to page table entry and visa versa.
*/