diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-29 18:01:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-29 18:01:09 -0400 |
| commit | 981e893ed537cbaa08f8089d480db4165e6d71c0 (patch) | |
| tree | b0e8f100477be9e25feced30a9c1cbd75e0dc408 | |
| parent | 0f2776e6151a123552fd06b666fe755fa780a967 (diff) | |
| parent | cab5e127eef040399902caa8e1510795583fa03a (diff) | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Ingo Molnar:
"A late breaking fix from John. (The bug fixed has a hard lockup
potential, but that was not observed, warnings were)"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
time: Revert to calling clock_was_set_delayed() while in irq context
| -rw-r--r-- | kernel/time/timekeeping.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 0aa4ce81bc16..5b40279ecd71 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c | |||
| @@ -1435,7 +1435,8 @@ void update_wall_time(void) | |||
| 1435 | out: | 1435 | out: |
| 1436 | raw_spin_unlock_irqrestore(&timekeeper_lock, flags); | 1436 | raw_spin_unlock_irqrestore(&timekeeper_lock, flags); |
| 1437 | if (clock_set) | 1437 | if (clock_set) |
| 1438 | clock_was_set(); | 1438 | /* Have to call _delayed version, since in irq context*/ |
| 1439 | clock_was_set_delayed(); | ||
| 1439 | } | 1440 | } |
| 1440 | 1441 | ||
| 1441 | /** | 1442 | /** |