diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-12 10:22:32 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-12 10:22:32 +0000 |
| commit | 78157f5f8cde58d3c552ad6f0ad65118a92e3529 (patch) | |
| tree | 02476bdee08159c29579a99252f7b85a2275e60c /kernel | |
| parent | c4a3c95bcca5d9997e73c581b8cf6fb9adf8434c (diff) | |
| parent | 16c29dd8dd14a722836ca31440486feb2d730e29 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/pm.c | 2 | ||||
| -rw-r--r-- | kernel/time/timekeeping.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c index fe4b09cf829..c72b7a43beb 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) |