From 7544493bd138e34bca410fbbad383bb7bb7ddbfb Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 31 Dec 2011 12:36:16 +0100 Subject: [PATCH] Reduce differences between our VKERNEL and VKERNEL64 configurations. * Removes KTR from VKERNEL. * Removes VM_PAGE_DEBUG from VKERNEL64. * Some whitespace adjustments. --- sys/config/VKERNEL | 4 ++-- sys/config/VKERNEL64 | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/config/VKERNEL b/sys/config/VKERNEL index ba02b6b110..e5c81b800d 100644 --- a/sys/config/VKERNEL +++ b/sys/config/VKERNEL @@ -13,8 +13,8 @@ cpu I686_CPU options DEBUG_PCTRACK -options KTR -options KTR_SPIN_CONTENTION +##options KTR +##options KTR_SPIN_CONTENTION #options DEBUG_CRIT_SECTIONS options QUOTA diff --git a/sys/config/VKERNEL64 b/sys/config/VKERNEL64 index da66f1bca3..141e9e6049 100644 --- a/sys/config/VKERNEL64 +++ b/sys/config/VKERNEL64 @@ -16,7 +16,6 @@ options DEBUG_PCTRACK ##options KTR_SPIN_CONTENTION #options DEBUG_CRIT_SECTIONS -options VM_PAGE_DEBUG options QUOTA options DUMMYNET options IPFIREWALL #firewall @@ -34,12 +33,12 @@ options ALTQ_FAIRQ #fair queue #options ALTQ_NOPCC #don't use processor cycle counter options ALTQ_DEBUG #for debugging -options IPSEC #IP security -options IPSEC_ESP #IP security (crypto; define w/ IPSEC) -options IPSEC_DEBUG #debug for IP security +options IPSEC #IP security +options IPSEC_ESP #IP security (crypto; define w/ IPSEC) +options IPSEC_DEBUG #debug for IP security options HAMMER -options NULLFS #NULL filesystem +options NULLFS #NULL filesystem options EXT2FS options INET #InterNETworking options INET6 #IPv6 communications protocols -- 2.11.4.GIT