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
Turning trellis back to trunk to check in the latest differnce.
[linux-2.6.git]
/
planetlab-2.6.27-x86_64.config
diff --git
a/planetlab-2.6.27-x86_64.config
b/planetlab-2.6.27-x86_64.config
index
346206e
..
d95f73c
100644
(file)
--- a/
planetlab-2.6.27-x86_64.config
+++ b/
planetlab-2.6.27-x86_64.config
@@
-1,7
+1,7
@@
#
# Automatically generated make config: don't edit
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27.14-vs2.3.0.36.4.
0
.planetlab
-#
Tue Feb 3 15:43:02
2009
+# Linux kernel version: 2.6.27.14-vs2.3.0.36.4.
2
.planetlab
+#
Wed Apr 8 13:25:37
2009
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@
-76,12
+76,25
@@
CONFIG_TASK_IO_ACCOUNTING=y
# CONFIG_AUDIT is not set
# CONFIG_IKCONFIG is not set
CONFIG_LOG_BUF_SHIFT=17
# CONFIG_AUDIT is not set
# CONFIG_IKCONFIG is not set
CONFIG_LOG_BUF_SHIFT=17
-# CONFIG_CGROUPS is not set
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+# CONFIG_CGROUP_NS is not set
+CONFIG_CGROUP_DEVICE=y
CONFIG_OOM_PANIC=y
CONFIG_OOM_PANIC=y
+CONFIG_CPUSETS=y
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-# CONFIG_GROUP_SCHED is not set
+CONFIG_GROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_MM_OWNER=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
CONFIG_SYSFS_DEPRECATED=y
CONFIG_SYSFS_DEPRECATED_V2=y
CONFIG_SYSFS_DEPRECATED=y
CONFIG_SYSFS_DEPRECATED_V2=y
+CONFIG_PROC_PID_CPUSET=y
CONFIG_RELAY=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_RELAY=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
@@
-387,7
+400,7
@@
CONFIG_NET=y
#
# Networking options
#
#
# Networking options
#
-# CONFIG_NET_NS is not set
+CONFIG_NET_NS=y
CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
CONFIG_UNIX=y
CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
CONFIG_UNIX=y
@@
-1043,10
+1056,10
@@
CONFIG_NETDEVICES=y
CONFIG_IFB=m
CONFIG_DUMMY=m
CONFIG_BONDING=m
CONFIG_IFB=m
CONFIG_DUMMY=m
CONFIG_BONDING=m
-# CONFIG_MACVLAN is not set
+CONFIG_MACVLAN=y
CONFIG_EQUALIZER=m
CONFIG_TUN=m
CONFIG_EQUALIZER=m
CONFIG_TUN=m
-# CONFIG_VETH is not set
+CONFIG_VETH=y
CONFIG_NET_SB1000=m
# CONFIG_ARCNET is not set
CONFIG_PHYLIB=m
CONFIG_NET_SB1000=m
# CONFIG_ARCNET is not set
CONFIG_PHYLIB=m