diff options
| -rw-r--r-- | arch/cris/arch-v32/kernel/time.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/cris/arch-v32/kernel/time.c b/arch/cris/arch-v32/kernel/time.c index eb74dabbeb96..c17b01abdc3b 100644 --- a/arch/cris/arch-v32/kernel/time.c +++ b/arch/cris/arch-v32/kernel/time.c | |||
| @@ -107,8 +107,10 @@ static short int watchdog_key = 42; /* arbitrary 7 bit number */ | |||
| 107 | * is used though, so set this really low. */ | 107 | * is used though, so set this really low. */ |
| 108 | #define WATCHDOG_MIN_FREE_PAGES 8 | 108 | #define WATCHDOG_MIN_FREE_PAGES 8 |
| 109 | 109 | ||
| 110 | #if defined(CONFIG_ETRAX_WATCHDOG_NICE_DOGGY) | ||
| 110 | /* for reliable NICE_DOGGY behaviour */ | 111 | /* for reliable NICE_DOGGY behaviour */ |
| 111 | static int bite_in_progress; | 112 | static int bite_in_progress; |
| 113 | #endif | ||
| 112 | 114 | ||
| 113 | void reset_watchdog(void) | 115 | void reset_watchdog(void) |
| 114 | { | 116 | { |
| @@ -155,7 +157,9 @@ void handle_watchdog_bite(struct pt_regs *regs) | |||
| 155 | 157 | ||
| 156 | nmi_enter(); | 158 | nmi_enter(); |
| 157 | oops_in_progress = 1; | 159 | oops_in_progress = 1; |
| 160 | #if defined(CONFIG_ETRAX_WATCHDOG_NICE_DOGGY) | ||
| 158 | bite_in_progress = 1; | 161 | bite_in_progress = 1; |
| 162 | #endif | ||
| 159 | printk(KERN_WARNING "Watchdog bite\n"); | 163 | printk(KERN_WARNING "Watchdog bite\n"); |
| 160 | 164 | ||
| 161 | /* Check if forced restart or unexpected watchdog */ | 165 | /* Check if forced restart or unexpected watchdog */ |
