From e56a5af4ed38e3791ceb26a8810a9b9cc24ecb47 Mon Sep 17 00:00:00 2001
From: Shi Weihua <shiwh@cn.fujitsu.com>
Date: Fri, 23 May 2008 13:04:59 -0700
Subject: [PATCH] --- yaml --- r: 97275 b: refs/heads/master c:
 7b26655f6208fdefa9ab0adc016116324f8d4ba8 h: refs/heads/master i:   97273:
 498a27480a9ad231084cde551651017aaee04ef0   97271:
 ae0ce95378ab6e6f55770ad0e142a93209f3f0ee v: v3

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

diff --git a/[refs] b/[refs]
index 29eea2dad8f2..61be14647da3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f99c90094bffbe1cf38ef66f198a808c14a02d56
+refs/heads/master: 7b26655f6208fdefa9ab0adc016116324f8d4ba8
diff --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c
index 895d2d4c9493..14e97282eb6c 100644
--- a/trunk/kernel/sys.c
+++ b/trunk/kernel/sys.c
@@ -1652,7 +1652,7 @@ asmlinkage long sys_umask(int mask)
 asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3,
 			  unsigned long arg4, unsigned long arg5)
 {
-	long uninitialized_var(error);
+	long error = 0;
 
 	if (security_task_prctl(option, arg2, arg3, arg4, arg5, &error))
 		return error;
@@ -1701,9 +1701,7 @@ asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3,
 			error = PR_TIMING_STATISTICAL;
 			break;
 		case PR_SET_TIMING:
-			if (arg2 == PR_TIMING_STATISTICAL)
-				error = 0;
-			else
+			if (arg2 != PR_TIMING_STATISTICAL)
 				error = -EINVAL;
 			break;