---

yaml --- r: 97275 b: refs/heads/master c: 7b26655 h: refs/heads/master i: 97273: 498a274 97271: ae0ce95 v: v3
git-mirror · May 24, 2008 · e56a5af · e56a5af
1 parent 287ec59
commit e56a5af
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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;