Merge commit 'v2.6.38-rc1' into kbuild/packaging

1 files changed, 2 insertions, 4 deletions

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index bd27fbc9db62..7bb5cb64f3b8 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -481,9 +481,6 @@ enum
         NET_IPV4_CONF_PROMOTE_SECONDARIES=20,
         NET_IPV4_CONF_ARP_ACCEPT=21,
         NET_IPV4_CONF_ARP_NOTIFY=22,
-        NET_IPV4_CONF_ACCEPT_LOCAL=23,
-        NET_IPV4_CONF_SRC_VMARK=24,
-        __NET_IPV4_CONF_MAX
 };
 
 /* /proc/sys/net/ipv4/netfilter */
@@ -599,7 +596,6 @@ enum {
         NET_NEIGH_GC_THRESH3=16,
         NET_NEIGH_RETRANS_TIME_MS=17,
         NET_NEIGH_REACHABLE_TIME_MS=18,
-        __NET_NEIGH_MAX
 };
 
 /* /proc/sys/net/dccp */
@@ -984,6 +980,8 @@ extern int proc_doulongvec_minmax(struct ctl_table *, int,
                                   void __user *, size_t *, loff_t *);
 extern int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int,
                                       void __user *, size_t *, loff_t *);
+extern int proc_do_large_bitmap(struct ctl_table *, int,
+                                void __user *, size_t *, loff_t *);
 
 /*
  * Register a set of sysctl names by calling register_sysctl_table