From d3fa7af2d0e76fa79d7fbd39445b65c5f27bbfa3 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 6 Apr 2009 13:38:46 -0700
Subject: [PATCH] --- yaml --- r: 142242 b: refs/heads/master c:
 cd5f9a4c3199b090e91ea0064cb110985ba54814 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 528750a0b137..26ae67def483 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 609862be074cc20e007c640fd936ffe798b41abc
+refs/heads/master: cd5f9a4c3199b090e91ea0064cb110985ba54814
diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c
index 82350f8f04f6..b125e3387568 100644
--- a/trunk/kernel/sysctl.c
+++ b/trunk/kernel/sysctl.c
@@ -97,8 +97,8 @@ static int neg_one = -1;
 #endif
 
 static int zero;
-static int one = 1;
-static int two = 2;
+static int __maybe_unused one = 1;
+static int __maybe_unused two = 2;
 static unsigned long one_ul = 1;
 static int one_hundred = 100;