From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 18 Jul 2012 09:24:41 +0000 (+0200)
Subject: Merge branch 'linus' into timers/core
X-Git-Tag: v3.6-rc1~165^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=eec19d1a0d04c80e66eef634f7b8f460f2ca5643;p=~emulex%2Finfiniband.git

Merge branch 'linus' into timers/core

Resolve semantic conflict in kernel/time/timekeeping.c.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

eec19d1a0d04c80e66eef634f7b8f460f2ca5643
diff --cc kernel/time/timekeeping.c
index 5980e902978,3447cfaf11e..f045cc50832
--- a/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();