From 96379e5f61e0f66da02e5056914f1aae83468985 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Sun, 25 Jun 2006 05:48:31 -0700
Subject: [PATCH] --- yaml --- r: 29753 b: refs/heads/master c:
 eab03ac7bd3e0da99eb9dc068772a85a5e3f3577 h: refs/heads/master i:   29751:
 c25f94e6236bda09b3b037f3f2e41ab6e21193d2 v: v3

---
 [refs]                       |  2 +-
 trunk/include/linux/sysctl.h |  4 +---
 trunk/kernel/sysctl.c        | 11 -----------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 1a45b22ca0f2..a9dfe5020d9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ad2914d9cc55be651ef3bd676981a72c9001a47
+refs/heads/master: eab03ac7bd3e0da99eb9dc068772a85a5e3f3577
diff --git a/trunk/include/linux/sysctl.h b/trunk/include/linux/sysctl.h
index c7132029af0f..6a60770984e9 100644
--- a/trunk/include/linux/sysctl.h
+++ b/trunk/include/linux/sysctl.h
@@ -55,7 +55,7 @@ enum
 	CTL_KERN=1,		/* General kernel info and control */
 	CTL_VM=2,		/* VM management */
 	CTL_NET=3,		/* Networking */
-	CTL_PROC=4,		/* Process info */
+	/* was CTL_PROC */
 	CTL_FS=5,		/* Filesystems */
 	CTL_DEBUG=6,		/* Debugging */
 	CTL_DEV=7,		/* Devices */
@@ -767,8 +767,6 @@ enum {
 	NET_BRIDGE_NF_FILTER_VLAN_TAGGED = 4,
 };
 
-/* CTL_PROC names: */
-
 /* CTL_FS names: */
 enum
 {
diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c
index eb8bd214e7d7..2c0e65819448 100644
--- a/trunk/kernel/sysctl.c
+++ b/trunk/kernel/sysctl.c
@@ -143,7 +143,6 @@ static struct ctl_table_header root_table_header =
 
 static ctl_table kern_table[];
 static ctl_table vm_table[];
-static ctl_table proc_table[];
 static ctl_table fs_table[];
 static ctl_table debug_table[];
 static ctl_table dev_table[];
@@ -202,12 +201,6 @@ static ctl_table root_table[] = {
 		.child		= net_table,
 	},
 #endif
-	{
-		.ctl_name	= CTL_PROC,
-		.procname	= "proc",
-		.mode		= 0555,
-		.child		= proc_table,
-	},
 	{
 		.ctl_name	= CTL_FS,
 		.procname	= "fs",
@@ -927,10 +920,6 @@ static ctl_table vm_table[] = {
 	{ .ctl_name = 0 }
 };
 
-static ctl_table proc_table[] = {
-	{ .ctl_name = 0 }
-};
-
 static ctl_table fs_table[] = {
 	{
 		.ctl_name	= FS_NRINODE,