From 99b9331a4f693e66f880734cd446190fcf14508d Mon Sep 17 00:00:00 2001
From: Alfred Perlstein <alfred@FreeBSD.org>
Date: Thu, 30 May 2002 07:32:58 +0000
Subject: [PATCH] Check for defined(__i386__) instead of just defined(i386)
 since the compiler will be updated to only define(__i386__) for ANSI
 cleanliness.

---
 sys/dev/ct/ct_machdep.h          | 6 +++---
 sys/dev/ncv/ncr53c500var.h       | 6 +++---
 sys/dev/stg/tmc18c30var.h        | 6 +++---
 sys/security/lomac/kernel_mmap.c | 2 +-
 sys/vm/vm_mmap.c                 | 6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sys/dev/ct/ct_machdep.h b/sys/dev/ct/ct_machdep.h
index f407aa5b6cd..dd3cc7adb9b 100644
--- a/sys/dev/ct/ct_machdep.h
+++ b/sys/dev/ct/ct_machdep.h
@@ -208,9 +208,9 @@ ct_cmdp_write_1(chp, val)
 	CT_BUS_WEIGHT(chp)
 }
 
-#if	defined(i386)
+#if	defined(__i386__)
 #define	SOFT_INTR_REQUIRED(slp)	(softintr((slp)->sl_irq))
-#else	/* !i386 */
+#else	/* !__i386__ */
 #define	SOFT_INTR_REQUIRED(slp)
-#endif	/* !i386 */
+#endif	/* !__i386__ */
 #endif	/* !_CT_MACHDEP_H_ */
diff --git a/sys/dev/ncv/ncr53c500var.h b/sys/dev/ncv/ncr53c500var.h
index fd84b4f791b..6ba7ef14bb7 100644
--- a/sys/dev/ncv/ncr53c500var.h
+++ b/sys/dev/ncv/ncr53c500var.h
@@ -95,9 +95,9 @@ void ncvattachsubr(struct ncv_softc *);
 int ncvprint(void *, const char *);
 int ncvintr(void *);
 
-#if	defined(i386)
+#if	defined(__i386__)
 #define	SOFT_INTR_REQUIRED(slp)	(softintr((slp)->sl_irq))
-#else	/* !i386 */
+#else	/* !__i386__ */
 #define	SOFT_INTR_REQUIRED(slp)
-#endif	/* !i386 */
+#endif	/* !__i386__ */
 #endif	/* !_NCR53C500VAR_H_ */
diff --git a/sys/dev/stg/tmc18c30var.h b/sys/dev/stg/tmc18c30var.h
index 99707c72594..520e7d008dc 100644
--- a/sys/dev/stg/tmc18c30var.h
+++ b/sys/dev/stg/tmc18c30var.h
@@ -103,9 +103,9 @@ void stgattachsubr(struct stg_softc *);
 int stgprint(void *, const char *);
 int stgintr(void *);
 
-#if	defined(i386)
+#if	defined(__i386__)
 #define	SOFT_INTR_REQUIRED(slp)	(softintr((slp)->sl_irq))
-#else	/* !i386 */
+#else	/* !__i386__ */
 #define	SOFT_INTR_REQUIRED(slp)
-#endif	/* !i386 */
+#endif	/* !__i386__ */
 #endif	/* !_TMC18C30VAR_H_ */
diff --git a/sys/security/lomac/kernel_mmap.c b/sys/security/lomac/kernel_mmap.c
index 8e5330d3daa..25e87920d4a 100644
--- a/sys/security/lomac/kernel_mmap.c
+++ b/sys/security/lomac/kernel_mmap.c
@@ -207,7 +207,7 @@ mmap(td, uap)
 		/* Address range must be all in user VM space. */
 		if (VM_MAXUSER_ADDRESS > 0 && addr + size > VM_MAXUSER_ADDRESS)
 			return (EINVAL);
-#ifndef i386
+#ifndef __i386__
 		if (VM_MIN_ADDRESS > 0 && addr < VM_MIN_ADDRESS)
 			return (EINVAL);
 #endif
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index c0033536212..d2989938e39 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -256,7 +256,7 @@ mmap(td, uap)
 		/* Address range must be all in user VM space. */
 		if (VM_MAXUSER_ADDRESS > 0 && addr + size > VM_MAXUSER_ADDRESS)
 			return (EINVAL);
-#ifndef i386
+#ifndef __i386__
 		if (VM_MIN_ADDRESS > 0 && addr < VM_MIN_ADDRESS)
 			return (EINVAL);
 #endif
@@ -603,7 +603,7 @@ munmap(td, uap)
 	 */
 	if (VM_MAXUSER_ADDRESS > 0 && addr + size > VM_MAXUSER_ADDRESS)
 		return (EINVAL);
-#ifndef i386
+#ifndef __i386__
 	if (VM_MIN_ADDRESS > 0 && addr < VM_MIN_ADDRESS)
 		return (EINVAL);
 #endif
@@ -749,7 +749,7 @@ madvise(td, uap)
 	if (VM_MAXUSER_ADDRESS > 0 &&
 		((vm_offset_t) uap->addr + uap->len) > VM_MAXUSER_ADDRESS)
 		return (EINVAL);
-#ifndef i386
+#ifndef __i386__
 	if (VM_MIN_ADDRESS > 0 && uap->addr < VM_MIN_ADDRESS)
 		return (EINVAL);
 #endif