From 425aeb637be4789d65cb12587bfefae8753d7569 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Mon, 9 Jan 2012 22:36:41 -0800
Subject: [PATCH] --- yaml --- r: 295455 b: refs/heads/master c:
 e0d045290a8454ecd7f63c78c10d412f35d6ef94 h: refs/heads/master i:   295453:
 98fabbd0c0b6fa41ff1330c86bc3704139b29907   295451:
 e501e8643234d0c3da9126b8b7172f44a321c591   295447:
 e4545739ddef9f119f8b3320deb7521d47f8f573   295439:
 d1f76c2debe54b7046ba12f34a585478cff6202d   295423:
 1e980cc1626de16993032f0f3477e0fddb743d2c v: v3

---
 [refs]                      |  2 +-
 trunk/fs/proc/proc_sysctl.c | 25 +++++++++++++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 52b59b194930..5061cdd94f63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 938aaa4f9249aa1519fd0db07fc72125de2df338
+refs/heads/master: e0d045290a8454ecd7f63c78c10d412f35d6ef94
diff --git a/trunk/fs/proc/proc_sysctl.c b/trunk/fs/proc/proc_sysctl.c
index 13faa48c467e..49799259b0f3 100644
--- a/trunk/fs/proc/proc_sysctl.c
+++ b/trunk/fs/proc/proc_sysctl.c
@@ -42,6 +42,21 @@ static struct ctl_table_root sysctl_table_root = {
 
 static DEFINE_SPINLOCK(sysctl_lock);
 
+static void init_header(struct ctl_table_header *head,
+	struct ctl_table_root *root, struct ctl_table_set *set,
+	struct ctl_table *table)
+{
+	head->ctl_table_arg = table;
+	INIT_LIST_HEAD(&head->ctl_entry);
+	head->used = 0;
+	head->count = 1;
+	head->nreg = 1;
+	head->unregistering = NULL;
+	head->root = root;
+	head->set = set;
+	head->parent = NULL;
+}
+
 /* called under sysctl_lock */
 static int use_table(struct ctl_table_header *p)
 {
@@ -932,14 +947,8 @@ struct ctl_table_header *__register_sysctl_table(
 		new_name += namelen + 1;
 	}
 	*prevp = table;
-	header->ctl_table_arg = table;
-
-	INIT_LIST_HEAD(&header->ctl_entry);
-	header->used = 0;
-	header->unregistering = NULL;
-	header->root = root;
-	header->count = 1;
-	header->nreg = 1;
+
+	init_header(header, root, NULL, table);
 	if (sysctl_check_table(path, table))
 		goto fail;