--- zzzz-none-000/linux-2.6.19.2/include/linux/sysctl.h	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/include/linux/sysctl.h	2007-07-09 10:47:09.000000000 +0000
@@ -6,17 +6,10 @@
  ****************************************************************
  ****************************************************************
  **
- **  WARNING:
  **  The values in this file are exported to user space via 
- **  the sysctl() binary interface.  Do *NOT* change the
- **  numbering of any existing values here, and do not change
- **  any numbers within any one set of values.  If you have to
- **  have to redefine an existing interface, use a new number for it.
- **  The kernel will then return -ENOTDIR to any application using
- **  the old binary interface.
- **
- **  For new interfaces unless you really need a binary number
- **  please use CTL_UNNUMBERED.
+ **  the sysctl() binary interface.  However this interface
+ **  is unstable and deprecated and will be removed in the future. 
+ **  For a stable interface use /proc/sys.
  **
  ****************************************************************
  ****************************************************************
@@ -55,7 +48,6 @@
 #ifdef __KERNEL__
 #define CTL_ANY		-1	/* Matches any name */
 #define CTL_NONE	0
-#define CTL_UNNUMBERED	CTL_NONE	/* sysctl without a binary number */
 #endif
 
 enum
@@ -160,7 +152,23 @@
 	KERN_MAX_LOCK_DEPTH=74,
 	KERN_NMI_WATCHDOG=75, /* int: enable/disable nmi watchdog */
 	KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
+#ifdef CONFIG_ALPHA_UAC_SYSCTL
+ 	KERN_UAC_POLICY=77,	/* int: Alpha unaligned access control policy flags */
+#endif /* CONFIG_ALPHA_UAC_SYSCTL */
+#ifdef CONFIG_GRKERNSEC
+ 	KERN_GRSECURITY=98,	/* grsecurity */
+#endif
+ 
+#ifdef CONFIG_PAX_SOFTMODE
+ 	KERN_PAX=99,		/* PaX control */
+#endif
+};
+ 
+#ifdef CONFIG_PAX_SOFTMODE
+enum {
+ 	PAX_SOFTMODE=1		/* PaX: disable/enable soft mode */
 };
+#endif
 
 
 
@@ -426,6 +434,7 @@
 	NET_CIPSOV4_CACHE_BUCKET_SIZE=119,
 	NET_CIPSOV4_RBM_OPTFMT=120,
 	NET_CIPSOV4_RBM_STRICTVALID=121,
+	NET_IPV4_IGMP_TOS=122,
 };
 
 enum {
@@ -969,8 +978,8 @@
 /*
  * Register a set of sysctl names by calling register_sysctl_table
  * with an initialised array of ctl_table's.  An entry with zero
- * ctl_name and NULL procname terminates the table.  table->de will be
- * set up by the registration and need not be initialised in advance.
+ * ctl_name terminates the table.  table->de will be set up by the
+ * registration and need not be initialised in advance.
  *
  * sysctl names can be mirrored automatically under /proc/sys.  The
  * procname supplied controls /proc naming.
@@ -981,10 +990,7 @@
  * Leaf nodes in the sysctl tree will be represented by a single file
  * under /proc; non-leaf nodes will be represented by directories.  A
  * null procname disables /proc mirroring at this node.
- *
- * sysctl entries with a zero ctl_name will not be available through
- * the binary sysctl interface.
- *
+ * 
  * sysctl(2) can automatically manage read and write requests through
  * the sysctl table.  The data and maxlen fields of the ctl_table
  * struct enable minimal validation of the values being written to be