From 7fe7b3a452c84dec35e51ace090dc9d97aee2689 Mon Sep 17 00:00:00 2001
From: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Date: Wed, 27 Feb 2013 17:05:22 -0800
Subject: [PATCH] --- yaml --- r: 359397 b: refs/heads/master c:
 cd89f46b52cd2354d3d322ea7eab193b86ba03c6 h: refs/heads/master i:   359395:
 867412c9d13ea54b836a70e92929f13a4ed541cf v: v3

---
 [refs]                        | 2 +-
 trunk/kernel/utsname_sysctl.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6e4614a80452..7bc82ea1b4ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df1778be1a33edffa51d094eeda87c858ded6560
+refs/heads/master: cd89f46b52cd2354d3d322ea7eab193b86ba03c6
diff --git a/trunk/kernel/utsname_sysctl.c b/trunk/kernel/utsname_sysctl.c
index 63da38c2d820..4f69f9a5e221 100644
--- a/trunk/kernel/utsname_sysctl.c
+++ b/trunk/kernel/utsname_sysctl.c
@@ -15,6 +15,8 @@
 #include <linux/sysctl.h>
 #include <linux/wait.h>
 
+#ifdef CONFIG_PROC_SYSCTL
+
 static void *get_uts(ctl_table *table, int write)
 {
 	char *which = table->data;
@@ -38,7 +40,6 @@ static void put_uts(ctl_table *table, int write, void *which)
 		up_write(&uts_sem);
 }
 
-#ifdef CONFIG_PROC_SYSCTL
 /*
  *	Special case of dostring for the UTS structure. This has locks
  *	to observe. Should this be in kernel/sys.c ????