summaryrefslogtreecommitdiffstats
path: root/sys/amd64/conf/GENERIC
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2005-03-31 20:55:10 +0000
committerobrien <obrien@FreeBSD.org>2005-03-31 20:55:10 +0000
commit13d646d6a006d20150ab76db9fe8b7824fea9466 (patch)
tree2dcb978aafc4f12e229954c0818d1c82621605d1 /sys/amd64/conf/GENERIC
parent59794f2db3388bdfdb9e913327a363ecf6b60e79 (diff)
downloadFreeBSD-src-13d646d6a006d20150ab76db9fe8b7824fea9466.zip
FreeBSD-src-13d646d6a006d20150ab76db9fe8b7824fea9466.tar.gz
MFR5: rev 1.421.2.6: Enable support for 32-bit Linux binaries by default.
There are too many questions in freebsd-amd64@ about how to enable Linux support that it seems a required piece of functionality. Thus we should just have it on by default.
Diffstat (limited to 'sys/amd64/conf/GENERIC')
-rw-r--r--sys/amd64/conf/GENERIC5
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index fc14ba1..e375041 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -46,8 +46,10 @@ options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_GPT # GUID Partition Tables.
+options COMPAT_43 # Needed by COMPAT_LINUX32
options COMPAT_IA32 # Compatible with i386 binaries
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
+options COMPAT_LINUX32 # Compatible with i386 linux binaries
options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
options SYSVSHM # SYSV-style shared memory
@@ -77,6 +79,9 @@ options SMP # Symmetric MultiProcessor Kernel
device atpic # 8259A compatability
options NO_MIXED_MODE # Don't penalize working chipsets
+# Linux 32-bit ABI support
+options LINPROCFS # Cannot be a module yet.
+
# Bus support. Do not remove isa, even if you have no isa slots
device acpi
device isa
OpenPOWER on IntegriCloud