summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjmg <jmg@FreeBSD.org>1998-06-30 08:40:33 +0000
committerjmg <jmg@FreeBSD.org>1998-06-30 08:40:33 +0000
commitb5aa561ef988adaaed72f9e02c0712e9b24d5cdc (patch)
treef26e7e687b98a67b532db562e16b8e9d53683940 /sys
parent4ec564fe9db6d9133ca4a0abd7cd7fd74a464943 (diff)
downloadFreeBSD-src-b5aa561ef988adaaed72f9e02c0712e9b24d5cdc.zip
FreeBSD-src-b5aa561ef988adaaed72f9e02c0712e9b24d5cdc.tar.gz
remove option LINUX as it did nothing, add DEBUG_LINUX to debug the
linux emulation... (actually moved LINUX to opt_dontuse.h)
Diffstat (limited to 'sys')
-rw-r--r--sys/compat/linux/linux_util.h4
-rw-r--r--sys/conf/options.i3866
-rw-r--r--sys/i386/conf/options.i3866
-rw-r--r--sys/i386/linux/linux_util.h4
4 files changed, 14 insertions, 6 deletions
diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h
index 7760e8d..58a477d 100644
--- a/sys/compat/linux/linux_util.h
+++ b/sys/compat/linux/linux_util.h
@@ -28,7 +28,7 @@
*
* from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp
* from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp
- * $Id$
+ * $Id: linux_util.h,v 1.5 1997/02/22 09:38:30 peter Exp $
*/
/*
@@ -39,6 +39,8 @@
#ifndef _LINUX_UTIL_H_
#define _LINUX_UTIL_H_
+#include "opt_linux.h"
+
#include <vm/vm.h>
#include <vm/vm_param.h>
#include <vm/pmap.h>
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 680ccaf..703000b 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-# $Id: options.i386,v 1.79 1998/06/30 08:24:01 jmg Exp $
+# $Id: options.i386,v 1.80 1998/06/30 08:32:51 jmg Exp $
BOUNCEPAGES opt_bounce.h
DISABLE_PSE
@@ -10,6 +10,9 @@ VM86 opt_vm86.h
IBCS2 opt_dontuse.h
COMPAT_LINUX opt_dontuse.h
+LINUX opt_dontuse.h
+
+DEBUG_LINUX opt_linux.h
SHOW_BUSYBUFS
TUNE_1542
@@ -74,7 +77,6 @@ I386_CPU opt_global.h
I486_CPU opt_global.h
I586_CPU opt_global.h
I686_CPU opt_global.h
-LINUX opt_global.h
SC_SPLASH_SCREEN opt_syscons.h
MAXCONS opt_syscons.h
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index 680ccaf..703000b 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-# $Id: options.i386,v 1.79 1998/06/30 08:24:01 jmg Exp $
+# $Id: options.i386,v 1.80 1998/06/30 08:32:51 jmg Exp $
BOUNCEPAGES opt_bounce.h
DISABLE_PSE
@@ -10,6 +10,9 @@ VM86 opt_vm86.h
IBCS2 opt_dontuse.h
COMPAT_LINUX opt_dontuse.h
+LINUX opt_dontuse.h
+
+DEBUG_LINUX opt_linux.h
SHOW_BUSYBUFS
TUNE_1542
@@ -74,7 +77,6 @@ I386_CPU opt_global.h
I486_CPU opt_global.h
I586_CPU opt_global.h
I686_CPU opt_global.h
-LINUX opt_global.h
SC_SPLASH_SCREEN opt_syscons.h
MAXCONS opt_syscons.h
diff --git a/sys/i386/linux/linux_util.h b/sys/i386/linux/linux_util.h
index 7760e8d..58a477d 100644
--- a/sys/i386/linux/linux_util.h
+++ b/sys/i386/linux/linux_util.h
@@ -28,7 +28,7 @@
*
* from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp
* from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp
- * $Id$
+ * $Id: linux_util.h,v 1.5 1997/02/22 09:38:30 peter Exp $
*/
/*
@@ -39,6 +39,8 @@
#ifndef _LINUX_UTIL_H_
#define _LINUX_UTIL_H_
+#include "opt_linux.h"
+
#include <vm/vm.h>
#include <vm/vm_param.h>
#include <vm/pmap.h>
OpenPOWER on IntegriCloud