X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-2.6.git;a=blobdiff_plain;f=arch%2Fi386%2Fkernel%2Ftime.c;h=b0c5ee2b3446d4f96520b4fd04458ec9a6d47cd1;hp=6f794a78ee1e7be1f12074b7c0cfaad15aa8a9fd;hb=8446f1d391f3d27e6bf9c43d4cbcdac0ca720417;hpb=4732efbeb997189d9f9b04708dc26bf8613ed721 diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c index 6f794a78ee1..b0c5ee2b344 100644 --- a/arch/i386/kernel/time.c +++ b/arch/i386/kernel/time.c @@ -422,6 +422,7 @@ static int timer_resume(struct sys_device *dev) last_timer->resume(); cur_timer = last_timer; last_timer = NULL; + touch_softlockup_watchdog(); return 0; }