Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/tg3.c
	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/mac80211/ieee80211_i.h

1 files changed, 2 insertions, 4 deletions

diff --git a/kernel/sys.c b/kernel/sys.c
index 895d2d4c9493..14e97282eb6c 100644
--- a/kernel/sys.c
+++ b/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;