patch-2.1.32 linux/include/linux/sysctl.h

Next file: linux/init/main.c
Previous file: linux/include/linux/sunrpc/xprt.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.31/linux/include/linux/sysctl.h linux/include/linux/sysctl.h
@@ -28,64 +28,80 @@
 /* For internal pattern-matching use only: */
 #ifdef __KERNEL__
 #define CTL_ANY		-1	/* Matches any name */
-#define CTL_NONE		0
+#define CTL_NONE	0
 #endif
 
-#define CTL_KERN	1	/* General kernel info and control */
-#define CTL_VM		2	/* VM management */
-#define CTL_NET		3	/* Networking */
-#define CTL_PROC	4	/* Process info */
-#define CTL_FS		5	/* Filesystems */
-#define CTL_DEBUG	6	/* Debugging */
-#define CTL_DEV		7	/* Devices */
-#define CTL_MAXID	8
+enum
+{
+	CTL_KERN=1,		/* General kernel info and control */
+	CTL_VM,			/* VM management */
+	CTL_NET,		/* Networking */
+	CTL_PROC,		/* Process info */
+	CTL_FS,			/* Filesystems */
+	CTL_DEBUG,		/* Debugging */
+	CTL_DEV,		/* Devices */
+};
+
 
 /* CTL_KERN names: */
-#define KERN_OSTYPE	1	/* string: system version */
-#define KERN_OSRELEASE	2	/* string: system release */
-#define KERN_OSREV	3	/* int: system revision */
-#define KERN_VERSION	4	/* string: compile time info */
-#define KERN_SECUREMASK 5	/* struct: maximum rights mask */
-#define KERN_PROF 	6	/* table: profiling information */
-#define KERN_NODENAME   7
-#define KERN_DOMAINNAME 8
-#define KERN_NRINODE	9
-#define KERN_MAXINODE	10
-#define KERN_NRFILE	11
-#define KERN_MAXFILE	12
-#define KERN_MAXID	13
-#define KERN_SECURELVL	14	/* int: system security level */
-#define KERN_PANIC	15	/* int: panic timeout */
-#define KERN_REALROOTDEV 16	/* real root device to mount after initrd */
-#define KERN_NFSRNAME	17	/* NFS root name */
-#define KERN_NFSRADDRS	18	/* NFS root addresses */
-#define KERN_JAVA_INTERPRETER 19 /* path to Java(tm) interpreter */
-#define KERN_JAVA_APPLETVIEWER 20 /* path to Java(tm) appletviewer */
-#define KERN_SPARC_REBOOT 21 /* reboot command on Sparc */
+enum
+{
+	KERN_OSTYPE=1,		/* string: system version */
+	KERN_OSRELEASE,		/* string: system release */
+	KERN_OSREV,		/* int: system revision */
+	KERN_VERSION,		/* string: compile time info */
+	KERN_SECUREMASK,	/* struct: maximum rights mask */
+	KERN_PROF,		/* table: profiling information */
+	KERN_NODENAME,
+	KERN_DOMAINNAME,
+	KERN_NRINODE,
+	KERN_MAXINODE,
+	KERN_NRFILE,
+	KERN_MAXFILE,
+	KERN_SECURELVL,		/* int: system security level */
+	KERN_PANIC,		/* int: panic timeout */
+	KERN_REALROOTDEV,	/* real root device to mount after initrd */
+	KERN_NFSRNAME,		/* NFS root name */
+	KERN_NFSRADDRS,		/* NFS root addresses */
+	KERN_JAVA_INTERPRETER,	/* path to Java(tm) interpreter */
+	KERN_JAVA_APPLETVIEWER,	/* path to Java(tm) appletviewer */
+	KERN_SPARC_REBOOT,	/* reboot command on Sparc */
+	KERN_CTLALTDEL,		/* int: allow ctl-alt-del to reboot */
+	KERN_PRINTK,            /* sturct: control printk logging parameters */
+};
+
 
 /* CTL_VM names: */
-#define VM_SWAPCTL	1	/* struct: Set vm swapping control */
-#define VM_KSWAPD	2	/* struct: control background pageout */
-#define VM_FREEPG	3	/* struct: Set free page thresholds */
-#define VM_BDFLUSH	4	/* struct: Control buffer cache flushing */
-#define VM_MAXID	5
-#define VM_OVERCOMMIT_MEMORY 7	/* Turn off the virtual memory safety limit */
+enum
+{
+	VM_SWAPCTL=1,		/* struct: Set vm swapping control */
+	VM_KSWAPD,		/* struct: control background pageout */
+	VM_SWAPOUT,		/* int: Background pageout interval */
+	VM_FREEPG,		/* struct: Set free page thresholds */
+	VM_BDFLUSH,		/* struct: Control buffer cache flushing */
+	VM_OVERCOMMIT_MEMORY,	/* Turn off the virtual memory safety limit */
+};
+
 
 /* CTL_NET names: */
-#define NET_CORE        1
-#define NET_ETHER       2
-#define NET_802         3
-#define NET_UNIX        4
-#define NET_IPV4        5
-#define NET_IPX         6
-#define NET_ATALK       7
-#define NET_NETROM      8
-#define NET_AX25        9
-#define NET_BRIDGE	10
-#define NET_IPV6	11
-#define NET_ROSE	12
-#define NET_X25		13
-#define NET_TR		14
+enum
+{
+	NET_CORE=1,
+	NET_ETHER,
+	NET_802,
+	NET_UNIX,
+	NET_IPV4,
+	NET_IPX,
+	NET_ATALK,
+	NET_NETROM,
+	NET_AX25,
+	NET_BRIDGE,
+	NET_IPV6,
+	NET_ROSE,
+	NET_X25,
+	NET_TR,
+};
+
 
 /* /proc/sys/net/core */
 
@@ -218,7 +234,7 @@
 #ifdef __KERNEL__
 
 extern asmlinkage int sys_sysctl(struct __sysctl_args *);
-extern void init_sysctl(void);
+extern void sysctl_init(void);
 
 typedef struct ctl_table ctl_table;
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov