X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-2.6.git;a=blobdiff_plain;f=arch%2Fx86_64%2Fkernel%2Ftime.c;h=2b5d9da912a26d2d7119563217d2b19dcf2c0e24;hp=66bf6ddeb0c334a956c6bc2e75beeca9262b5f9e;hb=8446f1d391f3d27e6bf9c43d4cbcdac0ca720417;hpb=4732efbeb997189d9f9b04708dc26bf8613ed721;ds=sidebyside diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c index 66bf6ddeb0c..2b5d9da912a 100644 --- a/arch/x86_64/kernel/time.c +++ b/arch/x86_64/kernel/time.c @@ -1041,6 +1041,7 @@ static int timer_resume(struct sys_device *dev) write_sequnlock_irqrestore(&xtime_lock,flags); jiffies += sleep_length; wall_jiffies += sleep_length; + touch_softlockup_watchdog(); return 0; }