Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / include / linux / sysctl.h

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 0c923ca..40d1f8f 100644 (file)
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -164,6 +164,8 @@ enum
        VM_MAX_MAP_COUNT=22,    /* int: Maximum number of mmaps/address-space */
        VM_LAPTOP_MODE=23,      /* vm laptop mode */
        VM_BLOCK_DUMP=24,       /* block dump mode */
+       VM_HUGETLB_GROUP=25,    /* permitted hugetlb group */
+       VM_VFS_CACHE_PRESSURE=26, /* dcache/icache reclaim pressure */
 };
 
 
@@ -187,7 +189,6 @@ enum
        NET_DECNET=15,
        NET_ECONET=16,
        NET_SCTP=17, 
-       NET_TUX=18,
 };
 
 /* /proc/sys/kernel/random */
@@ -626,55 +627,6 @@ enum {
        NET_BRIDGE_NF_FILTER_VLAN_TAGGED = 4,
 };
 
-/* /proc/sys/net/tux/ */
-enum {
-       NET_TUX_DOCROOT                 =  1,
-       NET_TUX_LOGFILE                 =  2,
-       NET_TUX_EXTCGI                  =  3,
-       NET_TUX_STOP                    =  4,
-       NET_TUX_CLIENTPORT              =  5,
-       NET_TUX_LOGGING                 =  6,
-       NET_TUX_SERVERPORT              =  7,
-       NET_TUX_THREADS                 =  8,
-       NET_TUX_KEEPALIVE_TIMEOUT       =  9,
-       NET_TUX_MAX_KEEPALIVE_BW        = 10,
-       NET_TUX_DEFER_ACCEPT            = 11,
-       NET_TUX_MAX_FREE_REQUESTS       = 12,
-       NET_TUX_MAX_CONNECT             = 13,
-       NET_TUX_MAX_BACKLOG             = 14,
-       NET_TUX_MODE_FORBIDDEN          = 15,
-       NET_TUX_MODE_ALLOWED            = 16,
-       NET_TUX_MODE_USERSPACE          = 17,
-       NET_TUX_MODE_CGI                = 18,
-       NET_TUX_CGI_UID                 = 19,
-       NET_TUX_CGI_GID                 = 20,
-       NET_TUX_CGIROOT                 = 21,
-       NET_TUX_LOGENTRY_ALIGN_ORDER    = 22,
-       NET_TUX_NONAGLE                 = 23,
-       NET_TUX_ACK_PINGPONG            = 24,
-       NET_TUX_PUSH_ALL                = 25,
-       NET_TUX_ZEROCOPY_PARSE          = 26,
-       NET_CONFIG_TUX_DEBUG_BLOCKING   = 27,
-       NET_TUX_PAGE_AGE_START          = 28,
-       NET_TUX_PAGE_AGE_ADV            = 29,
-       NET_TUX_PAGE_AGE_MAX            = 30,
-       NET_TUX_VIRTUAL_SERVER          = 31,
-       NET_TUX_MAX_OBJECT_SIZE         = 32,
-       NET_TUX_COMPRESSION             = 33,
-       NET_TUX_NOID                    = 34,
-       NET_TUX_CGI_INHERIT_CPU         = 35,
-       NET_TUX_CGI_CPU_MASK            = 36,
-       NET_TUX_ZEROCOPY_HEADER         = 37,
-       NET_TUX_ZEROCOPY_SENDFILE       = 38,
-       NET_TUX_ALL_USERSPACE           = 39,
-       NET_TUX_REDIRECT_LOGGING        = 40,
-       NET_TUX_REFERER_LOGGING         = 41,
-       NET_TUX_MAX_HEADER_LEN          = 42,
-       NET_TUX_404_PAGE                = 43,
-       NET_TUX_MAX_KEEPALIVES          = 44,
-       NET_TUX_IGNORE_QUERY            = 45,
-};
-
 /* CTL_PROC names: */
 
 /* CTL_FS names: */