6 files changed, 17 insertions, 16 deletions

diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 6c61263ff9..74cc0fc6bb 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -311,6 +311,7 @@ int audit_match_class(int class, unsigned syscall)
         return classes[class][AUDIT_WORD(syscall)] & AUDIT_BIT(syscall);
 }
 
+#ifdef CONFIG_AUDITSYSCALL
 static inline int audit_match_class_bits(int class, u32 *mask)
 {
         int i;
@@ -347,6 +348,7 @@ static int audit_match_signal(struct audit_entry *entry)
                 return 1;
         }
 }
+#endif
 
 /* Common user-space to kernel rule translation. */
 static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule)
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 40d56a3124..b98b80ccf4 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -97,25 +97,26 @@ static int suspend_prepare(suspend_state_t state)
                 }
         }
 
-        if (pm_ops->prepare) {
-                if ((error = pm_ops->prepare(state)))
-                        goto Thaw;
-        }
-
         suspend_console();
         error = device_suspend(PMSG_SUSPEND);
         if (error) {
                 printk(KERN_ERR "Some devices failed to suspend\n");
-                goto Resume_devices;
+                goto Resume_console;
         }
+        if (pm_ops->prepare) {
+                if ((error = pm_ops->prepare(state)))
+                        goto Resume_devices;
+        }
+
         error = disable_nonboot_cpus();
         if (!error)
                 return 0;
 
         enable_nonboot_cpus();
- Resume_devices:
         pm_finish(state);
+ Resume_devices:
         device_resume();
+ Resume_console:
         resume_console();
  Thaw:
         thaw_processes();
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c
index b6d77a8a1c..7e11e2c98b 100644
--- a/kernel/sys_ni.c
+++ b/kernel/sys_ni.c
@@ -145,4 +145,6 @@ cond_syscall(sys_ioprio_get);
 /* New file descriptors */
 cond_syscall(sys_signalfd);
 cond_syscall(sys_timerfd);
+cond_syscall(compat_sys_signalfd);
+cond_syscall(compat_sys_timerfd);
 cond_syscall(sys_eventfd);
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index 3db5c3c460..51b6a6a615 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -74,7 +74,7 @@ static struct clocksource *watchdog;
 static struct timer_list watchdog_timer;
 static DEFINE_SPINLOCK(watchdog_lock);
 static cycle_t watchdog_last;
-static int watchdog_resumed;
+static unsigned long watchdog_resumed;
 
 /*
  * Interval: 0.5sec Threshold: 0.0625s
@@ -104,9 +104,7 @@ static void clocksource_watchdog(unsigned long data)
 
         spin_lock(&watchdog_lock);
 
-        resumed = watchdog_resumed;
-        if (unlikely(resumed))
-                watchdog_resumed = 0;
+        resumed = test_and_clear_bit(0, &watchdog_resumed);
 
         wdnow = watchdog->read();
         wd_nsec = cyc2ns(watchdog, (wdnow - watchdog_last) & watchdog->mask);
@@ -151,9 +149,7 @@ static void clocksource_watchdog(unsigned long data)
 }
 static void clocksource_resume_watchdog(void)
 {
-        spin_lock(&watchdog_lock);
-        watchdog_resumed = 1;
-        spin_unlock(&watchdog_lock);
+        set_bit(0, &watchdog_resumed);
 }
 
 static void clocksource_check_watchdog(struct clocksource *cs)
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index f9217bf644..3d1042f82a 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -273,6 +273,8 @@ static int timekeeping_resume(struct sys_device *dev)
         unsigned long flags;
         unsigned long now = read_persistent_clock();
 
+        clocksource_resume();
+
         write_seqlock_irqsave(&xtime_lock, flags);
 
         if (now && (now > timekeeping_suspend_time)) {
diff --git a/kernel/timer.c b/kernel/timer.c
index a6c580ac08..5ec5490f8d 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1499,8 +1499,6 @@ unregister_time_interpolator(struct time_interpolator *ti)
                 prev = &curr->next;
         }
 
-        clocksource_resume();
-
         write_seqlock_irqsave(&xtime_lock, flags);
         if (ti == time_interpolator) {
                 /* we lost the best time-interpolator: */