summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralfred <alfred@FreeBSD.org>2002-05-30 07:32:58 +0000
committeralfred <alfred@FreeBSD.org>2002-05-30 07:32:58 +0000
commit26c9c27f03bdb0ef924ca84475566e77d01c14d5 (patch)
treee28fa7a497a1f756cd06d2e16ccb65be76af020c
parent4320d2c0b94ff0dc507427f40628e753166b2815 (diff)
downloadFreeBSD-src-26c9c27f03bdb0ef924ca84475566e77d01c14d5.zip
FreeBSD-src-26c9c27f03bdb0ef924ca84475566e77d01c14d5.tar.gz
Check for defined(__i386__) instead of just defined(i386) since the compiler
will be updated to only define(__i386__) for ANSI cleanliness.
-rw-r--r--sys/dev/ct/ct_machdep.h6
-rw-r--r--sys/dev/ncv/ncr53c500var.h6
-rw-r--r--sys/dev/stg/tmc18c30var.h6
-rw-r--r--sys/security/lomac/kernel_mmap.c2
-rw-r--r--sys/vm/vm_mmap.c6
5 files changed, 13 insertions, 13 deletions
diff --git a/sys/dev/ct/ct_machdep.h b/sys/dev/ct/ct_machdep.h
index f407aa5..dd3cc7a 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 fd84b4f..6ba7ef1 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 99707c7..520e7d0 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 8e5330d..25e8792 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 c003353..d298993 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
OpenPOWER on IntegriCloud