This commit was manufactured by cvs2svn to create tag

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

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index cf93d31..c09a1de 100644 (file)
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -134,8 +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_SETUID_DUMPABLE=68, /* int: behaviour of dumps for setuid core */
+       KERN_SETUID_DUMPABLE=67, /* int: behaviour of dumps for setuid core */
+       KERN_VSHELPER=68,       /* string: path to vshelper policy agent */
        KERN_DUMP=69,           /* dir: dump parameters */
 };
 
@@ -170,7 +170,6 @@ 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 */
 };