diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 08:37:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 08:37:01 -0700 |
| commit | 9732b6112343df2872518ec6701c8ef729310a05 (patch) | |
| tree | 9e3dcc461845038da4730c2062eee546348ca445 /kernel/time | |
| parent | 9e9abecfc0ff3a9ad2ead954b37bbfcb863c775e (diff) | |
| parent | 1a9a3e76dde191f82f7a8a66059dcbb4a9f63ff3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-kgdb
* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-kgdb:
kgdb: always use icache flush for sw breakpoints
kgdb: fix SMP NMI kgdb_handle_exception exit race
kgdb: documentation fixes
kgdb: allow static kgdbts boot configuration
kgdb: add documentation
kgdb: Kconfig fix
kgdb: add kgdb internal test suite
kgdb: fix several kgdb regressions
kgdb: kgdboc pl011 I/O module
kgdb: fix optional arch functions and probe_kernel_*
kgdb: add x86 HW breakpoints
kgdb: print breakpoint removed on exception
kgdb: clocksource watchdog
kgdb: fix NMI hangs
kgdb: fix kgdboc dynamic module configuration
kgdb: document parameters
x86: kgdb support
consoles: polling support, kgdboc
kgdb: core
uaccess: add probe_kernel_write()
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/clocksource.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index 7f60097d443..f61402b1f2d 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c @@ -222,6 +222,18 @@ void clocksource_resume(void) } /** + * clocksource_touch_watchdog - Update watchdog + * + * Update the watchdog after exception contexts such as kgdb so as not + * to incorrectly trip the watchdog. + * + */ +void clocksource_touch_watchdog(void) +{ + clocksource_resume_watchdog(); +} + +/** * clocksource_get_next - Returns the selected clocksource * */ |