Updating from the mainline PL kernel

[linux-2.6.git] / planetlab-2.6.27-i686.config

diff --git a/planetlab-2.6.27-i686.config b/planetlab-2.6.27-i686.config
index 8b63994..fbc313c 100644 (file)
--- a/planetlab-2.6.27-i686.config
+++ b/planetlab-2.6.27-i686.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27.10-vs2.3.0.36.4
-# Mon Feb  2 16:51:13 2009
+# Linux kernel version: 2.6.27.14-vs2.3.0.36.4.0.planetlab
+# Tue Feb  3 15:48:12 2009
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -77,6 +77,7 @@ CONFIG_TASK_IO_ACCOUNTING=y
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_CGROUPS is not set
+CONFIG_OOM_PANIC=y
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 # CONFIG_GROUP_SCHED is not set
 CONFIG_SYSFS_DEPRECATED=y
@@ -136,7 +137,7 @@ CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
+# CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 CONFIG_MODVERSIONS=y
@@ -186,15 +187,7 @@ CONFIG_X86_GENERICARCH=y
 # CONFIG_X86_VSMP is not set
 # CONFIG_X86_RDC321X is not set
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-CONFIG_PARAVIRT_GUEST=y
-CONFIG_XEN_SAVE_RESTORE=y
-# CONFIG_VMI is not set
-# CONFIG_KVM_CLOCK is not set
-CONFIG_KVM_GUEST=y
-CONFIG_LGUEST_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_CLOCK is not set
-# CONFIG_PARAVIRT_DEBUG is not set
+# CONFIG_PARAVIRT_GUEST is not set
 # CONFIG_MEMTEST is not set
 CONFIG_X86_CYCLONE_TIMER=y
 # CONFIG_M386 is not set
@@ -416,7 +409,7 @@ CONFIG_NET=y
 #
 # Networking options
 #
-CONFIG_NET_NS=y
+# CONFIG_NET_NS is not set
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
@@ -479,6 +472,7 @@ CONFIG_DEFAULT_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IP_VS is not set
+CONFIG_ICMP_IPOD=y
 CONFIG_IPV6=y
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
@@ -546,6 +540,7 @@ CONFIG_NETFILTER_XT_TARGET_SECMARK=m
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+CONFIG_NETFILTER_XT_TARGET_SETXID=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 # CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
@@ -617,6 +612,19 @@ CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
+CONFIG_IP_NF_SET=m
+CONFIG_IP_NF_SET_MAX=256
+CONFIG_IP_NF_SET_HASHSIZE=1024
+CONFIG_IP_NF_SET_IPMAP=m
+CONFIG_IP_NF_SET_MACIPMAP=m
+CONFIG_IP_NF_SET_PORTMAP=m
+CONFIG_IP_NF_SET_IPHASH=m
+CONFIG_IP_NF_SET_NETHASH=m
+CONFIG_IP_NF_SET_IPPORTHASH=m
+CONFIG_IP_NF_SET_IPTREE=m
+CONFIG_IP_NF_SET_IPTREEMAP=m
+CONFIG_IP_NF_MATCH_SET=m
+CONFIG_IP_NF_TARGET_SET=m
 
 #
 # IPv6: Netfilter Configuration
@@ -827,7 +835,6 @@ CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_ATA_OVER_ETH=m
-# CONFIG_VIRTIO_BLK is not set
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_MISC_DEVICES=y
 # CONFIG_IBM_ASM is not set
@@ -1085,7 +1092,7 @@ CONFIG_BONDING=m
 # CONFIG_MACVLAN is not set
 CONFIG_EQUALIZER=m
 CONFIG_TUN=m
-CONFIG_VETH=m
+# CONFIG_VETH is not set
 CONFIG_NET_SB1000=m
 # CONFIG_ARCNET is not set
 CONFIG_PHYLIB=m
@@ -1294,7 +1301,7 @@ CONFIG_ZD1211RW=m
 # USB Network Adapters
 #
 CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
+# CONFIG_USB_KAWETH is not set
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_USBNET=m
@@ -1348,7 +1355,6 @@ CONFIG_NETCONSOLE=m
 CONFIG_NETPOLL=y
 CONFIG_NETPOLL_TRAP=y
 CONFIG_NET_POLL_CONTROLLER=y
-# CONFIG_VIRTIO_NET is not set
 # CONFIG_ISDN is not set
 # CONFIG_PHONE is not set
 
@@ -1473,12 +1479,9 @@ CONFIG_SERIAL_8250_RSA=y
 #
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_CONSOLE_POLL=y
 CONFIG_SERIAL_JSM=m
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
-CONFIG_HVC_DRIVER=y
-CONFIG_VIRTIO_CONSOLE=y
 CONFIG_IPMI_HANDLER=m
 # CONFIG_IPMI_PANIC_EVENT is not set
 CONFIG_IPMI_DEVICE_INTERFACE=m
@@ -1490,7 +1493,6 @@ CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_GEODE=m
 CONFIG_HW_RANDOM_VIA=m
-# CONFIG_HW_RANDOM_VIRTIO is not set
 # CONFIG_NVRAM is not set
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -1510,7 +1512,7 @@ CONFIG_NSC_GPIO=m
 CONFIG_CS5535_GPIO=m
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_HPET is not set
-# CONFIG_HANGCHECK_TIMER is not set
+CONFIG_HANGCHECK_TIMER=y
 CONFIG_TCG_TPM=m
 CONFIG_TCG_TIS=m
 CONFIG_TCG_NSC=m
@@ -2197,9 +2199,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
 # CONFIG_BUILD_DOCSRC is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_KGDB=y
-CONFIG_KGDB_SERIAL_CONSOLE=y
-# CONFIG_KGDB_TESTS is not set
+# CONFIG_KGDB is not set
 # CONFIG_STRICT_DEVMEM is not set
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_EARLY_PRINTK=y
@@ -2230,6 +2230,7 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 #
 # Linux VServer
 #
+CONFIG_VSERVER_FILESHARING=y
 # CONFIG_VSERVER_AUTO_LBACK is not set
 # CONFIG_VSERVER_AUTO_SINGLE is not set
 CONFIG_VSERVER_COWBL=y
@@ -2362,8 +2363,6 @@ CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
 # CONFIG_LGUEST is not set
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_RING=y
 # CONFIG_VIRTIO_PCI is not set
 # CONFIG_VIRTIO_BALLOON is not set