vserver 1.9.5.x5

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

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index c484516..7db3d5d 100644 (file)
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -134,7 +134,8 @@ enum
        KERN_SPARC_SCONS_PWROFF=64, /* int: serial console power-off halt */
        KERN_HZ_TIMER=65,       /* int: hz timer on or off */
        KERN_UNKNOWN_NMI_PANIC=66, /* int: unknown nmi panic flag */
-       KERN_VSHELPER=67,       /* string: path to vshelper policy agent */
+       KERN_BOOTLOADER_TYPE=67, /* int: boot loader type */
+       KERN_VSHELPER=68,       /* string: path to vshelper policy agent */
 };
 
 
@@ -160,7 +161,7 @@ enum
        VM_PAGEBUF=17,          /* struct: Control pagebuf parameters */
        VM_HUGETLB_PAGES=18,    /* int: Number of available Huge Pages */
        VM_SWAPPINESS=19,       /* Tendency to steal mapped memory */
-       VM_LOWER_ZONE_PROTECTION=20,/* Amount of protection of lower zones */
+       VM_LOWMEM_RESERVE_RATIO=20,/* reservation ratio for lower memory zones */
        VM_MIN_FREE_KBYTES=21,  /* Minimum free kilobytes to maintain */
        VM_MAX_MAP_COUNT=22,    /* int: Maximum number of mmaps/address-space */
        VM_LAPTOP_MODE=23,      /* vm laptop mode */
@@ -168,6 +169,7 @@ enum
        VM_HUGETLB_GROUP=25,    /* permitted hugetlb group */
        VM_VFS_CACHE_PRESSURE=26, /* dcache/icache reclaim pressure */
        VM_LEGACY_VA_LAYOUT=27, /* legacy/compatibility virtual address space layout */
+       VM_SWAP_TOKEN_TIMEOUT=28, /* default time for token time out */
 };
 
 
@@ -343,6 +345,7 @@ enum
        NET_TCP_DEFAULT_WIN_SCALE=105,
        NET_TCP_MODERATE_RCVBUF=106,
        NET_TCP_TSO_WIN_DIVISOR=107,
+       NET_TCP_BIC_BETA=108,
 };
 
 enum {
@@ -364,6 +367,7 @@ enum {
        NET_IPV4_ROUTE_MIN_PMTU=16,
        NET_IPV4_ROUTE_MIN_ADVMSS=17,
        NET_IPV4_ROUTE_SECRET_INTERVAL=18,
+       NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS=19,
 };
 
 enum
@@ -663,7 +667,7 @@ enum
        FS_LEASES=13,   /* int: leases enabled */
        FS_DIR_NOTIFY=14,       /* int: directory notification enabled */
        FS_LEASE_TIME=15,       /* int: maximum time to wait for a lease break */
-       FS_DQSTATS=16,  /* disc quota usage statistics */
+       FS_DQSTATS=16,  /* disc quota usage statistics and control */
        FS_XFS=17,      /* struct: control xfs parameters */
        FS_AIO_NR=18,   /* current system-wide number of aio requests */
        FS_AIO_MAX_NR=19,       /* system-wide maximum number of aio requests */
@@ -679,6 +683,7 @@ enum {
        FS_DQ_ALLOCATED = 6,
        FS_DQ_FREE = 7,
        FS_DQ_SYNCS = 8,
+       FS_DQ_WARNINGS = 9,
 };
 
 /* CTL_DEBUG names: */
@@ -793,6 +798,8 @@ extern int proc_dointvec_jiffies(ctl_table *, int, struct file *,
                                 void __user *, size_t *, loff_t *);
 extern int proc_dointvec_userhz_jiffies(ctl_table *, int, struct file *,
                                        void __user *, size_t *, loff_t *);
+extern int proc_dointvec_ms_jiffies(ctl_table *, int, struct file *,
+                                   void __user *, size_t *, loff_t *);
 extern int proc_doulongvec_minmax(ctl_table *, int, struct file *,
                                  void __user *, size_t *, loff_t *);
 extern int proc_doulongvec_ms_jiffies_minmax(ctl_table *table, int,
@@ -810,6 +817,7 @@ extern int do_sysctl_strategy (ctl_table *table,
 extern ctl_handler sysctl_string;
 extern ctl_handler sysctl_intvec;
 extern ctl_handler sysctl_jiffies;
+extern ctl_handler sysctl_ms_jiffies;
 
 
 /*