X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config-vserver;h=2b0b943b0a2d93d136ad109b14cc9caa4f1ca188;hb=7aaeffe221d50217038450227d7f467015ec230f;hp=fcc5c88bb72edd33115af57bc019386426801b12;hpb=bb638391efed9099020230959d167a9e9e82a8df;p=linux-2.6.git

diff --git a/config-vserver b/config-vserver
index fcc5c88bb..2b0b943b0 100644
--- a/config-vserver
+++ b/config-vserver
@@ -1,23 +1,22 @@
+CONFIG_CFS_HARD_LIMITS=y
 # CONFIG_BLK_DEV_VROOT is not set
-# CONFIG_CFS_HARD_LIMITS is not set
-# CONFIG_TAGGING_GID16 is not set
-# CONFIG_TAGGING_INTERN is not set
+
+# CONFIG_VSERVER_AUTO_LBACK is not set
+# CONFIG_VSERVER_AUTO_SINGLE is not set
+CONFIG_VSERVER_COWBL=y
+# CONFIG_VSERVER_VTIME is not set
+# CONFIG_VSERVER_DEVICE is not set
+CONFIG_VSERVER_PROC_SECURE=y
+# CONFIG_VSERVER_HARDCPU is not set
 # CONFIG_TAGGING_NONE is not set
 # CONFIG_TAGGING_UID16 is not set
+# CONFIG_TAGGING_GID16 is not set
+CONFIG_TAGGING_ID24=y
+# CONFIG_TAGGING_INTERN is not set
 # CONFIG_TAG_NFSD is not set
-# CONFIG_VSERVER_DEBUG is not set
-# CONFIG_VSERVER_DEVICE is not set
-# CONFIG_VSERVER_IDLELIMIT is not set
 # CONFIG_VSERVER_PRIVACY is not set
-# CONFIG_VSERVER_VTIME is not set
-CONFIG_TAGGING_ID24=y
+CONFIG_VSERVER_CONTEXTS=256
+CONFIG_VSERVER_WARN=y
+# CONFIG_VSERVER_DEBUG is not set
 CONFIG_VSERVER=y
-CONFIG_VSERVER_AUTO_LBACK=y
-CONFIG_VSERVER_AUTO_SINGLE=y
-CONFIG_VSERVER_CONTEXTS=768
-CONFIG_VSERVER_COWBL=y
-CONFIG_VSERVER_HARDCPU=y
-CONFIG_VSERVER_IDLETIME=y
-CONFIG_VSERVER_PROC_SECURE=y
 CONFIG_VSERVER_SECURITY=y
-CONFIG_VSERVER_WARN=y