diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:20:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:20:37 -0400 |
| commit | 23946a8a980d13af7b84bcf3ce023e0d166ec83f (patch) | |
| tree | 193d2959a7b62b48aaf2236447f1378779e55104 /arch/i386/kernel/nmi.c | |
| parent | 66e8bb97055ff22a0e5ea89c0a75a35f8738cc96 (diff) | |
| parent | 2b14c30b46e007a16c665cc86329bf4a1d9ff6ee (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'arch/i386/kernel/nmi.c')
| -rw-r--r-- | arch/i386/kernel/nmi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c index 2dd928a84645..acb351478e42 100644 --- a/arch/i386/kernel/nmi.c +++ b/arch/i386/kernel/nmi.c | |||
| @@ -575,6 +575,7 @@ void touch_nmi_watchdog (void) | |||
| 575 | */ | 575 | */ |
| 576 | touch_softlockup_watchdog(); | 576 | touch_softlockup_watchdog(); |
| 577 | } | 577 | } |
| 578 | EXPORT_SYMBOL(touch_nmi_watchdog); | ||
| 578 | 579 | ||
| 579 | extern void die_nmi(struct pt_regs *, const char *msg); | 580 | extern void die_nmi(struct pt_regs *, const char *msg); |
| 580 | 581 | ||