projects
/
GitHub
/
exynos8895
/
android_kernel_samsung_universal8895.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f726a69
a018540
)
Merge branch 'linus' into timers/core
author
Ingo Molnar
<mingo@kernel.org>
Wed, 18 Jul 2012 09:24:41 +0000
(11:24 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Wed, 18 Jul 2012 09:25:55 +0000
(11:25 +0200)
Resolve semantic conflict in kernel/time/timekeeping.c.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1
2
kernel/time/timekeeping.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
kernel/time/timekeeping.c
index 5980e902978c4b84b4c3723ff6c1ffab2b2e6a14,3447cfaf11e7d61b11d30bc063967e47d85e59d4..f045cc50832d0fc8aee045755d3ba60d655f2647
---
1
/
kernel/time/timekeeping.c
---
2
/
kernel/time/timekeeping.c
+++ b/
kernel/time/timekeeping.c
@@@
-745,6
-717,7
+745,7
@@@
static void timekeeping_resume(void
timekeeper.clock->cycle_last = timekeeper.clock->read(timekeeper.clock);
timekeeper.ntp_error = 0;
timekeeping_suspended = 0;
- timekeeping_update(false);
++ timekeeping_update(&timekeeper, false);
write_sequnlock_irqrestore(&timekeeper.lock, flags);
touch_softlockup_watchdog();