3 files changed, 4 insertions, 4 deletions

diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
index f7921360efad..7e52eb051f22 100644
--- a/kernel/futex_compat.c
+++ b/kernel/futex_compat.c
@@ -61,10 +61,10 @@ void compat_exit_robust_list(struct task_struct *curr)
         if (fetch_robust_entry(&upending, &pending,
                                &head->list_op_pending, &pip))
                 return;
-        if (upending)
+        if (pending)
                 handle_futex_death((void __user *)pending + futex_offset, curr, pip);
 
-        while (compat_ptr(uentry) != &head->list) {
+        while (entry != (struct robust_list __user *) &head->list) {
                 /*
                  * A pending lock might already be on the list, so
                  * dont process it twice:
diff --git a/kernel/kmod.c b/kernel/kmod.c
index 9809cc1f33d6..c6a4f8aebeba 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -505,7 +505,7 @@ int call_usermodehelper_pipe(char *path, char **argv, char **envp,
         if (ret < 0)
                 goto out;
 
-        return call_usermodehelper_exec(sub_info, 1);
+        return call_usermodehelper_exec(sub_info, UMH_WAIT_EXEC);
 
   out:
         call_usermodehelper_freeinfo(sub_info);
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index cd91237dbfe3..de6a2d6b3ebb 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -226,7 +226,7 @@ static void sync_cmos_clock(unsigned long dummy)
 
 static void notify_cmos_timer(void)
 {
-        if (no_sync_cmos_clock)
+        if (!no_sync_cmos_clock)
                 mod_timer(&sync_cmos_timer, jiffies + 1);
 }