diff options
Diffstat (limited to 'kernel/watchdog.c')
-rw-r--r-- | kernel/watchdog.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index be5e74e62be6..83fb63155cbc 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c | |||
@@ -37,7 +37,7 @@ static DEFINE_PER_CPU(struct hrtimer, watchdog_hrtimer); | |||
37 | static DEFINE_PER_CPU(bool, softlockup_touch_sync); | 37 | static DEFINE_PER_CPU(bool, softlockup_touch_sync); |
38 | static DEFINE_PER_CPU(bool, hard_watchdog_warn); | 38 | static DEFINE_PER_CPU(bool, hard_watchdog_warn); |
39 | static DEFINE_PER_CPU(bool, soft_watchdog_warn); | 39 | static DEFINE_PER_CPU(bool, soft_watchdog_warn); |
40 | #ifdef CONFIG_PERF_EVENTS_NMI | 40 | #ifdef CONFIG_HARDLOCKUP_DETECTOR |
41 | static DEFINE_PER_CPU(unsigned long, hrtimer_interrupts); | 41 | static DEFINE_PER_CPU(unsigned long, hrtimer_interrupts); |
42 | static DEFINE_PER_CPU(unsigned long, hrtimer_interrupts_saved); | 42 | 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); |
@@ -51,7 +51,7 @@ static int __initdata no_watchdog; | |||
51 | /* | 51 | /* |
52 | * Should we panic when a soft-lockup or hard-lockup occurs: | 52 | * Should we panic when a soft-lockup or hard-lockup occurs: |
53 | */ | 53 | */ |
54 | #ifdef CONFIG_PERF_EVENTS_NMI | 54 | #ifdef CONFIG_HARDLOCKUP_DETECTOR |
55 | static int hardlockup_panic; | 55 | static int hardlockup_panic; |
56 | 56 | ||
57 | static int __init hardlockup_panic_setup(char *str) | 57 | static int __init hardlockup_panic_setup(char *str) |
@@ -152,7 +152,7 @@ void touch_softlockup_watchdog_sync(void) | |||
152 | __raw_get_cpu_var(watchdog_touch_ts) = 0; | 152 | __raw_get_cpu_var(watchdog_touch_ts) = 0; |
153 | } | 153 | } |
154 | 154 | ||
155 | #ifdef CONFIG_PERF_EVENTS_NMI | 155 | #ifdef CONFIG_HARDLOCKUP_DETECTOR |
156 | /* watchdog detector functions */ | 156 | /* watchdog detector functions */ |
157 | static int is_hardlockup(int cpu) | 157 | static int is_hardlockup(int cpu) |
158 | { | 158 | { |
@@ -189,7 +189,7 @@ static struct notifier_block panic_block = { | |||
189 | .notifier_call = watchdog_panic, | 189 | .notifier_call = watchdog_panic, |
190 | }; | 190 | }; |
191 | 191 | ||
192 | #ifdef CONFIG_PERF_EVENTS_NMI | 192 | #ifdef CONFIG_HARDLOCKUP_DETECTOR |
193 | static struct perf_event_attr wd_hw_attr = { | 193 | static struct perf_event_attr wd_hw_attr = { |
194 | .type = PERF_TYPE_HARDWARE, | 194 | .type = PERF_TYPE_HARDWARE, |
195 | .config = PERF_COUNT_HW_CPU_CYCLES, | 195 | .config = PERF_COUNT_HW_CPU_CYCLES, |
@@ -239,7 +239,7 @@ static void watchdog_interrupt_count(void) | |||
239 | } | 239 | } |
240 | #else | 240 | #else |
241 | static inline void watchdog_interrupt_count(void) { return; } | 241 | static inline void watchdog_interrupt_count(void) { return; } |
242 | #endif /* CONFIG_PERF_EVENTS_NMI */ | 242 | #endif /* CONFIG_HARDLOCKUP_DETECTOR */ |
243 | 243 | ||
244 | /* watchdog kicker functions */ | 244 | /* watchdog kicker functions */ |
245 | static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer) | 245 | static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer) |
@@ -342,7 +342,7 @@ static int watchdog(void *__bind_cpu) | |||
342 | } | 342 | } |
343 | 343 | ||
344 | 344 | ||
345 | #ifdef CONFIG_PERF_EVENTS_NMI | 345 | #ifdef CONFIG_HARDLOCKUP_DETECTOR |
346 | static int watchdog_nmi_enable(int cpu) | 346 | static int watchdog_nmi_enable(int cpu) |
347 | { | 347 | { |
348 | struct perf_event_attr *wd_attr; | 348 | struct perf_event_attr *wd_attr; |
@@ -393,7 +393,7 @@ static void watchdog_nmi_disable(int cpu) | |||
393 | #else | 393 | #else |
394 | static int watchdog_nmi_enable(int cpu) { return 0; } | 394 | static int watchdog_nmi_enable(int cpu) { return 0; } |
395 | static void watchdog_nmi_disable(int cpu) { return; } | 395 | static void watchdog_nmi_disable(int cpu) { return; } |
396 | #endif /* CONFIG_PERF_EVENTS_NMI */ | 396 | #endif /* CONFIG_HARDLOCKUP_DETECTOR */ |
397 | 397 | ||
398 | /* prepare/enable/disable routines */ | 398 | /* prepare/enable/disable routines */ |
399 | static int watchdog_prepare_cpu(int cpu) | 399 | static int watchdog_prepare_cpu(int cpu) |