From 349b1cf8fffe0037f9b5330f122ce5fd6cb43a6d Mon Sep 17 00:00:00 2001
From: mickey <mickey@openbsd.org>
Date: Fri, 3 May 1996 09:59:38 +0000
Subject: [PATCH] fix LOCORE->_LOCORE changes.

---
 sys/arch/vax/include/disklabel.h | 2 +-
 sys/arch/vax/include/ka650.h     | 4 ++--
 sys/arch/vax/include/nexus.h     | 2 +-
 sys/arch/vax/include/uvaxII.h    | 2 +-
 sys/arch/vax/uba/ubareg.h        | 2 +-
 sys/arch/vax/uba/ubavar.h        | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/arch/vax/include/disklabel.h b/sys/arch/vax/include/disklabel.h
index e1505c58f6c..f03ecb50fe2 100644
--- a/sys/arch/vax/include/disklabel.h
+++ b/sys/arch/vax/include/disklabel.h
@@ -39,7 +39,7 @@
 #define	RAW_PART	3			/* raw partition: xx?c (XXX) */
 
 /* Just a dummy */
-#ifndef LOCORE
+#ifndef _LOCORE
 struct cpu_disklabel {
 	int	cd_dummy;			/* must have one element. */
 };
diff --git a/sys/arch/vax/include/ka650.h b/sys/arch/vax/include/ka650.h
index 63d9f42d93f..ec370f3232c 100644
--- a/sys/arch/vax/include/ka650.h
+++ b/sys/arch/vax/include/ka650.h
@@ -79,7 +79,7 @@
 #define DMASER_BITS \
 "\20\20BHALT\17DCNEG\10QBNXM\6QBPE\5MEMERR\4LOSTERR\3NOGRANT\1DMANXM"
 
-#ifndef LOCORE
+#ifndef _LOCORE
 /*
  * Local registers (in I/O space)
  * This is done in disjoint sections.  Map names are set in locore.s
@@ -207,7 +207,7 @@ struct ka650_ipcr {
 };
 #define KA650_IPCR	0x20001e00
 
-#endif	LOCORE
+#endif	/* _LOCORE */
 
 /*
  * Physical start address of the Qbus memory.
diff --git a/sys/arch/vax/include/nexus.h b/sys/arch/vax/include/nexus.h
index 60343f3df2c..fe9a2fb0288 100644
--- a/sys/arch/vax/include/nexus.h
+++ b/sys/arch/vax/include/nexus.h
@@ -135,7 +135,7 @@ extern caddr_t *nex_vec;
 
 #define	NEX_CFGFLT	(0xfc000000)
 
-#ifndef LOCORE
+#ifndef _LOCORE
 #if defined(VAX780) || defined(VAX8600)
 #define	NEXFLT_BITS \
 "\20\40PARFLT\37WSQFLT\36URDFLT\35ISQFLT\34MXTFLT\33XMTFLT"
diff --git a/sys/arch/vax/include/uvaxII.h b/sys/arch/vax/include/uvaxII.h
index 7612b7abb35..7bb1ada32eb 100644
--- a/sys/arch/vax/include/uvaxII.h
+++ b/sys/arch/vax/include/uvaxII.h
@@ -102,7 +102,7 @@ void	uvaxII_settodr __P((time_t));
 #define	KA630CLK_RSTRT	010
 #define	KA630CLK_LANG	0360
 
-#ifndef LOCORE
+#ifndef _LOCORE
 struct ka630clock {
 	u_short	sec;
 	u_short	secalrm;
diff --git a/sys/arch/vax/uba/ubareg.h b/sys/arch/vax/uba/ubareg.h
index be7dd1ab475..f715debad4d 100644
--- a/sys/arch/vax/uba/ubareg.h
+++ b/sys/arch/vax/uba/ubareg.h
@@ -95,7 +95,7 @@
 #define	UBAIOADDR	0760000		/* start of I/O page */
 #define	UBAIOPAGES	16
 
-#ifndef LOCORE
+#ifndef _LOCORE
 /*
  * DWBUA hardware registers.
  */
diff --git a/sys/arch/vax/uba/ubavar.h b/sys/arch/vax/uba/ubavar.h
index 1cc8ea8ce9e..18d28ae0044 100644
--- a/sys/arch/vax/uba/ubavar.h
+++ b/sys/arch/vax/uba/ubavar.h
@@ -244,7 +244,7 @@ struct ubinfo {
 	(((bdp) << 28) | ((nmr) << 20) | ((mr) << 9) | (off))
 #endif
 
-#ifndef LOCORE
+#ifndef _LOCORE
 #ifdef _KERNEL
 #define	ubago(ui)	ubaqueue(ui, 0)
 
@@ -267,4 +267,4 @@ void	ubareset __P((int));
 int	ubasetup __P((int, struct buf *, int));
 
 #endif /* _KERNEL */
-#endif !LOCORE
+#endif /* !_LOCORE */
-- 
2.20.1