aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-12-12 10:22:21 +0000
committerMark Brown <broonie@linaro.org>2013-12-12 10:22:21 +0000
commit16c29dd8dd14a722836ca31440486feb2d730e29 (patch)
tree2f6b85ff48ddfe24c0f3688e4333695e18d469c7 /kernel
parentfae4bb16eec6425bd37495d8fa7d70bde98b368b (diff)
parent05bcf8f867f4af11c93395d4a6dd1dd52d8904ea (diff)
downloadlinaro-lsk-16c29dd8dd14a722836ca31440486feb2d730e29.tar.gz
Merge tag 'v3.10.24' into linux-linaro-lsk
This is the 3.10.24 stable release
Diffstat (limited to 'kernel')
-rw-r--r--kernel/irq/pm.c2
-rw-r--r--kernel/time/timekeeping.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
index cb228bf2176..abcd6ca86cb 100644
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -50,7 +50,7 @@ static void resume_irqs(bool want_early)
bool is_early = desc->action &&
desc->action->flags & IRQF_EARLY_RESUME;
- if (is_early != want_early)
+ if (!is_early && want_early)
continue;
raw_spin_lock_irqsave(&desc->lock, flags);
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index fcc261c5df2..1c5b0fcd83b 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1328,7 +1328,7 @@ static inline void old_vsyscall_fixup(struct timekeeper *tk)
tk->xtime_nsec -= remainder;
tk->xtime_nsec += 1ULL << tk->shift;
tk->ntp_error += remainder << tk->ntp_error_shift;
-
+ tk->ntp_error -= (1ULL << tk->shift) << tk->ntp_error_shift;
}
#else
#define old_vsyscall_fixup(tk)