git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The previous commit lost a hunk that I checked in in the one before that. The two...
[linux-2.6.git]
/
planetlab-2.6.22-i686.config
diff --git
a/planetlab-2.6.22-i686.config
b/planetlab-2.6.22-i686.config
index
9fc0685
..
cbcf5ff
100644
(file)
--- a/
planetlab-2.6.22-i686.config
+++ b/
planetlab-2.6.22-i686.config
@@
-1,7
+1,7
@@
#
# Automatically generated make config: don't edit
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22.1
4-vs2.3.0.29.1.onelab
-#
Thu Feb 7 10:50:39
2008
+# Linux kernel version: 2.6.22.1
8-vs2.3.0.32
+#
Fri Mar 21 18:03:12
2008
#
CONFIG_X86_32=y
CONFIG_GENERIC_TIME=y
#
CONFIG_X86_32=y
CONFIG_GENERIC_TIME=y
@@
-680,7
+680,6
@@
CONFIG_NET_PKTGEN=m
# CONFIG_HAMRADIO is not set
# CONFIG_IRDA is not set
# CONFIG_BT is not set
# CONFIG_HAMRADIO is not set
# CONFIG_IRDA is not set
# CONFIG_BT is not set
-# CONFIG_AF_RXRPC is not set
CONFIG_FIB_RULES=y
#
CONFIG_FIB_RULES=y
#
@@
-1266,11
+1265,11
@@
CONFIG_SKFP=m
# CONFIG_HIPPI is not set
CONFIG_PPP=m
# CONFIG_PPP_MULTILINK is not set
# CONFIG_HIPPI is not set
CONFIG_PPP=m
# CONFIG_PPP_MULTILINK is not set
-# CONFIG_PPP_FILTER is not set
-# CONFIG_PPP_ASYNC is not set
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PPP_DEFLATE is not set
-# CONFIG_PPP_BSDCOMP is not set
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
# CONFIG_PPP_MPPE is not set
# CONFIG_PPPOE is not set
# CONFIG_SLIP is not set
# CONFIG_PPP_MPPE is not set
# CONFIG_PPPOE is not set
# CONFIG_SLIP is not set
@@
-1469,7
+1468,7
@@
CONFIG_NSC_GPIO=m
CONFIG_CS5535_GPIO=m
# CONFIG_RAW_DRIVER is not set
# CONFIG_HPET is not set
CONFIG_CS5535_GPIO=m
# CONFIG_RAW_DRIVER is not set
# CONFIG_HPET is not set
-CONFIG_HANGCHECK_TIMER=
m
+CONFIG_HANGCHECK_TIMER=
y
#
# TPM devices
#
# TPM devices
@@
-1863,7
+1862,7
@@
CONFIG_QUOTACTL=y
CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not set
CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
+CONFIG_FUSE_FS=m
CONFIG_GENERIC_ACL=y
#
CONFIG_GENERIC_ACL=y
#
@@
-1944,7
+1943,6
@@
CONFIG_RPCSEC_GSS_SPKM3=m
# CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
# CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
# CONFIG_9P_FS is not set
#
# CONFIG_9P_FS is not set
#
@@
-2023,6
+2021,7
@@
CONFIG_NLS_UTF8=y
#
CONFIG_PROFILING=y
CONFIG_OPROFILE=m
#
CONFIG_PROFILING=y
CONFIG_OPROFILE=m
+CONFIG_CHOPSTIX=y
CONFIG_KPROBES=y
#
CONFIG_KPROBES=y
#
@@
-2055,7
+2054,7
@@
CONFIG_DEBUG_BUGVERBOSE=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_VM is not set
CONFIG_DEBUG_LIST=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_VM is not set
CONFIG_DEBUG_LIST=y
-# CONFIG_FRAME_POINTER is not set
+CONFIG_FRAME_POINTER=y
# CONFIG_FORCED_INLINING is not set
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_LKDTM is not set
# CONFIG_FORCED_INLINING is not set
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_LKDTM is not set
@@
-2072,6
+2071,11
@@
CONFIG_4KSTACKS=y
CONFIG_X86_FIND_SMP_CONFIG=y
CONFIG_X86_MPPARSE=y
CONFIG_DOUBLEFAULT=y
CONFIG_X86_FIND_SMP_CONFIG=y
CONFIG_X86_MPPARSE=y
CONFIG_DOUBLEFAULT=y
+CONFIG_KDB=y
+CONFIG_KDB_MODULES=m
+CONFIG_KDB_OFF=y
+CONFIG_KDB_CONTINUE_CATASTROPHIC=0
+CONFIG_KDB_USB=y
#
# Linux VServer
#
# Linux VServer
@@
-2093,7
+2097,7
@@
CONFIG_TAGGING_ID24=y
# CONFIG_TAGGING_INTERN is not set
# CONFIG_TAG_NFSD is not set
# CONFIG_VSERVER_PRIVACY is not set
# CONFIG_TAGGING_INTERN is not set
# CONFIG_TAG_NFSD is not set
# CONFIG_VSERVER_PRIVACY is not set
-CONFIG_VSERVER_CONTEXTS=
256
+CONFIG_VSERVER_CONTEXTS=
512
CONFIG_VSERVER_WARN=y
# CONFIG_VSERVER_DEBUG is not set
CONFIG_VSERVER=y
CONFIG_VSERVER_WARN=y
# CONFIG_VSERVER_DEBUG is not set
CONFIG_VSERVER=y