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 8baf21a..0c923ca 100644 (file)
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -134,7 +134,6 @@ enum
        KERN_SPARC_SCONS_PWROFF=64, /* int: serial console power-off halt */
        KERN_HZ_TIMER=65,       /* int: hz timer on or off */
        KERN_VSHELPER=66,       /* string: path to vshelper policy agent */
-       KERN_DUMP=67,           /* dir: dump parameters */
 };
 
 
@@ -165,9 +164,6 @@ 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 */
-       VM_LEGACY_VA_LAYOUT=27, /* legacy/compatibility virtual address space layout */
 };
 
 
@@ -343,13 +339,6 @@ enum
        NET_TCP_BIC_LOW_WINDOW=104,
        NET_TCP_DEFAULT_WIN_SCALE=105,
        NET_TCP_MODERATE_RCVBUF=106,
-#ifdef CONFIG_ICMP_IPOD
-       NET_IPV4_ICMP_IPOD_VERSION,
-       NET_IPV4_ICMP_IPOD_ENABLED,
-       NET_IPV4_ICMP_IPOD_HOST,
-       NET_IPV4_ICMP_IPOD_MASK,
-       NET_IPV4_ICMP_IPOD_KEY,
-#endif
 };
 
 enum {
@@ -822,24 +811,24 @@ typedef int ctl_handler (ctl_table *table, int __user *name, int nlen,
                         void **context);
 
 typedef int proc_handler (ctl_table *ctl, int write, struct file * filp,
-                         void __user *buffer, size_t *lenp, loff_t *ppos);
+                         void __user *buffer, size_t *lenp);
 
 extern int proc_dostring(ctl_table *, int, struct file *,
-                        void __user *, size_t *, loff_t *);
+                        void __user *, size_t *);
 extern int proc_dointvec(ctl_table *, int, struct file *,
-                        void __user *, size_t *, loff_t *);
+                        void __user *, size_t *);
 extern int proc_dointvec_bset(ctl_table *, int, struct file *,
-                             void __user *, size_t *, loff_t *);
+                             void __user *, size_t *);
 extern int proc_dointvec_minmax(ctl_table *, int, struct file *,
-                               void __user *, size_t *, loff_t *);
+                               void __user *, size_t *);
 extern int proc_dointvec_jiffies(ctl_table *, int, struct file *,
-                                void __user *, size_t *, loff_t *);
+                                void __user *, size_t *);
 extern int proc_dointvec_userhz_jiffies(ctl_table *, int, struct file *,
-                                       void __user *, size_t *, loff_t *);
+                                       void __user *, size_t *);
 extern int proc_doulongvec_minmax(ctl_table *, int, struct file *,
-                                 void __user *, size_t *, loff_t *);
+                                 void __user *, size_t *);
 extern int proc_doulongvec_ms_jiffies_minmax(ctl_table *table, int,
-                                     struct file *, void __user *, size_t *, loff_t *);
+                                     struct file *, void __user *, size_t *);
 
 extern int do_sysctl (int __user *name, int nlen,
                      void __user *oldval, size_t __user *oldlenp,