X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fsysctl.h;h=40d1f8f8822e42206a7bbaf1bfd2f1ef4bd4d0fd;hb=4df52aa9a6dd8cb5fff67da03cdfa58a3c607912;hp=8baf21acf26c149ecf72cc52f47062d0ebc17bc7;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 8baf21acf..40d1f8f88 100644
--- 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 */
 };
 
 
@@ -167,7 +166,6 @@ enum
 	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 */
 };
 
 
@@ -191,7 +189,6 @@ enum
 	NET_DECNET=15,
 	NET_ECONET=16,
 	NET_SCTP=17, 
-	NET_TUX=18,
 };
 
 /* /proc/sys/kernel/random */
@@ -343,13 +340,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 {
@@ -637,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: */
@@ -822,24 +763,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,