summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2000-09-16 18:55:05 +0000
committerphk <phk@FreeBSD.org>2000-09-16 18:55:05 +0000
commit2883081157094f0d8b0c047372e9202577eedd4d (patch)
tree1cf046484cbe70c3a0013b562bdff9126b752231
parentb88f8acdff7031b12943bcc2da41839a0e54d0ae (diff)
downloadFreeBSD-src-2883081157094f0d8b0c047372e9202577eedd4d.zip
FreeBSD-src-2883081157094f0d8b0c047372e9202577eedd4d.tar.gz
Make LINT compile.
-rw-r--r--sys/amd64/include/smp.h2
-rw-r--r--sys/conf/options7
-rw-r--r--sys/i386/include/smp.h2
-rw-r--r--sys/kern/kern_lock.c2
-rw-r--r--sys/sys/smp.h2
5 files changed, 6 insertions, 9 deletions
diff --git a/sys/amd64/include/smp.h b/sys/amd64/include/smp.h
index 59dcb16..425dac0 100644
--- a/sys/amd64/include/smp.h
+++ b/sys/amd64/include/smp.h
@@ -15,7 +15,7 @@
#ifdef _KERNEL
-#if defined(SMP) && defined(I386_CPU)
+#if defined(SMP) && defined(I386_CPU) && !defined(COMPILING_LINT)
#error SMP not supported with I386_CPU
#endif
#if defined(SMP) && !defined(APIC_IO)
diff --git a/sys/conf/options b/sys/conf/options
index 016be57..f927614 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -7,9 +7,8 @@
# compile) should be commented out; LINT should compile as much code
# as possible. Try to structure option-using code so that a single
# option only switch code on, or only switch code off, to make it
-# possible to have a full compile-test. If necessary, you can include
-# "opt_lint.h" and check for COMPILING_LINT to get maximum code
-# coverage.
+# possible to have a full compile-test. If necessary, you can check
+* for COMPILING_LINT to get maximum code coverage.
#
# All new options shall also be listed in either "conf/options" or
# "<machine>/conf/options.<machine>". Options that affect a single
@@ -46,7 +45,7 @@ ADW_ALLOW_MEMIO opt_adw.h # Allow PCI devices to use memory
# Miscellaneous options.
COMPAT_43 opt_compat.h
COMPAT_SUNOS opt_compat.h
-COMPILING_LINT opt_lint.h
+COMPILING_LINT opt_global.h
CY_PCI_FASTINTR
DDB
DDB_UNATTENDED opt_ddb.h
diff --git a/sys/i386/include/smp.h b/sys/i386/include/smp.h
index 59dcb16..425dac0 100644
--- a/sys/i386/include/smp.h
+++ b/sys/i386/include/smp.h
@@ -15,7 +15,7 @@
#ifdef _KERNEL
-#if defined(SMP) && defined(I386_CPU)
+#if defined(SMP) && defined(I386_CPU) && !defined(COMPILING_LINT)
#error SMP not supported with I386_CPU
#endif
#if defined(SMP) && !defined(APIC_IO)
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index 50d186c..cc1455c 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -41,8 +41,6 @@
* $FreeBSD$
*/
-#include "opt_lint.h"
-
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/lock.h>
diff --git a/sys/sys/smp.h b/sys/sys/smp.h
index 59dcb16..425dac0 100644
--- a/sys/sys/smp.h
+++ b/sys/sys/smp.h
@@ -15,7 +15,7 @@
#ifdef _KERNEL
-#if defined(SMP) && defined(I386_CPU)
+#if defined(SMP) && defined(I386_CPU) && !defined(COMPILING_LINT)
#error SMP not supported with I386_CPU
#endif
#if defined(SMP) && !defined(APIC_IO)
OpenPOWER on IntegriCloud