d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Remove local changes that leaked into my last commit.

Browse Source 
Spotted by:	juli
This commit is contained in:
Jeff Roberson 2004-01-24 21:45:25 +00:00
parent 048ac395be
commit 81aecdd39d
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/alpha/conf/GENERIC
View File

@ -60,6 +60,7 @@ options MSDOSFS #MSDOS Filesystem
options CD9660 #ISO 9660 Filesystem
options PROCFS #Process filesystem (requires PSEUDOFS)
options PSEUDOFS #Pseudo-filesystem framework
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
options COMPAT_FREEBSD4 #Compatible with FreeBSD4
options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI
options KTRACE #ktrace(1) syscall trace support
@ -73,13 +74,8 @@ options PFIL_HOOKS # pfil(9) framework
options DDB #Enable the kernel debugger
options INVARIANTS #Enable calls of extra sanity checking
options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
<<<<<<< GENERIC
options WITNESS #Enable checks to detect deadlocks and cycles
options WITNESS_SKIPSPIN
=======
#options WITNESS #Enable checks to detect deadlocks and cycles
options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
>>>>>>> 1.165
# To make an SMP kernel, the next line is needed
options SMP # Symmetric MultiProcessor Kernel