diff options
| author | obrien <obrien@FreeBSD.org> | 2003-06-01 20:26:38 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2003-06-01 20:26:38 +0000 |
| commit | 1814d2a2a4b4af8a767430064852aec853cb5b58 (patch) | |
| tree | c09f7396de43a64de762997ae7465a64abd6ff57 /sys | |
| parent | 96845a26441a097f98894f00d739c137110a98e2 (diff) | |
| download | FreeBSD-src-1814d2a2a4b4af8a767430064852aec853cb5b58.zip FreeBSD-src-1814d2a2a4b4af8a767430064852aec853cb5b58.tar.gz | |
Sync with i386/GENERIC ordering.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/conf/GENERIC | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 04de75d..4906b89 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -21,36 +21,36 @@ machine amd64 cpu HAMMER ident GENERIC -maxusers 0 -options IA32 -options COMPAT_FREEBSD4 - -makeoptions NO_MODULES=not_yet -#makeoptions DEBUG=-g #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. +#makeoptions DEBUG=-g +makeoptions NO_MODULES=not_yet + options SCHED_4BSD #4BSD scheduler options INET #InterNETworking options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support options MD_ROOT #MD is a potential root device options NFSCLIENT #Network Filesystem Client -options NFSSERVER -options NFS_ROOT #NFS usable as root device, requires NFSCLIENT +options NFSSERVER #Network Filesystem Server +options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options COMPAT_FREEBSD4 #Compatible with FreeBSD4 +options IA32 +options KTRACE +options SYSVSHM #SYSV-style shared memory +options SYSVMSG #SYSV-style message queues +options SYSVSEM #SYSV-style semaphores + # Debugging for use in -current -options INVARIANTS #Enable calls of extra sanity checking -options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS #options DDB #options ALT_BREAK_TO_DEBUGGER +options INVARIANTS #Enable calls of extra sanity checking +options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS -options SYSVMSG -options SYSVSEM -options SYSVSHM - device isa device pci device acpi @@ -60,8 +60,7 @@ device acpi device ata device atadisk # ATA disk drives device atapicd # ATAPI CDROM drives - -options KTRACE +options ATA_STATIC_ID #Static device numbering # atkbdc0 controls both the keyboard and the PS/2 mouse device atkbdc # AT keyboard controller @@ -97,8 +96,11 @@ device random # Entropy device device loop # Network loopback device ether # Ethernet support device md # Memory "disks" -device pty -device bpf +device pty # Pseudo-ttys (telnet etc) + +# The `bpf' device enables the Berkeley Packet Filter. +# Be aware of the administrative consequences of enabling this! +device bpf # Berkeley packet filter # USB support #device uhci # UHCI PCI->USB interface |
