diff options
| -rw-r--r-- | kernel/watchdog.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 501cb6edca4..5b1ee4f4ca0 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c | |||
| @@ -43,7 +43,6 @@ static DEFINE_PER_CPU(unsigned long, hrtimer_interrupts_saved); | |||
| 43 | static DEFINE_PER_CPU(struct perf_event *, watchdog_ev); | 43 | static DEFINE_PER_CPU(struct perf_event *, watchdog_ev); |
| 44 | #endif | 44 | #endif |
| 45 | 45 | ||
| 46 | static int __read_mostly did_panic; | ||
| 47 | static int __initdata no_watchdog; | 46 | static int __initdata no_watchdog; |
| 48 | 47 | ||
| 49 | 48 | ||
| @@ -180,18 +179,6 @@ static int is_softlockup(unsigned long touch_ts) | |||
| 180 | return 0; | 179 | return 0; |
| 181 | } | 180 | } |
| 182 | 181 | ||
| 183 | static int | ||
| 184 | watchdog_panic(struct notifier_block *this, unsigned long event, void *ptr) | ||
| 185 | { | ||
| 186 | did_panic = 1; | ||
| 187 | |||
| 188 | return NOTIFY_DONE; | ||
| 189 | } | ||
| 190 | |||
| 191 | static struct notifier_block panic_block = { | ||
| 192 | .notifier_call = watchdog_panic, | ||
| 193 | }; | ||
| 194 | |||
| 195 | #ifdef CONFIG_HARDLOCKUP_DETECTOR | 182 | #ifdef CONFIG_HARDLOCKUP_DETECTOR |
| 196 | static struct perf_event_attr wd_hw_attr = { | 183 | static struct perf_event_attr wd_hw_attr = { |
| 197 | .type = PERF_TYPE_HARDWARE, | 184 | .type = PERF_TYPE_HARDWARE, |
| @@ -564,8 +551,6 @@ static int __init spawn_watchdog_task(void) | |||
| 564 | cpu_callback(&cpu_nfb, CPU_ONLINE, cpu); | 551 | cpu_callback(&cpu_nfb, CPU_ONLINE, cpu); |
| 565 | register_cpu_notifier(&cpu_nfb); | 552 | register_cpu_notifier(&cpu_nfb); |
| 566 | 553 | ||
| 567 | atomic_notifier_chain_register(&panic_notifier_list, &panic_block); | ||
| 568 | |||
| 569 | return 0; | 554 | return 0; |
| 570 | } | 555 | } |
| 571 | early_initcall(spawn_watchdog_task); | 556 | early_initcall(spawn_watchdog_task); |
