Just some code cleanup to make touch_softlockup clearer and remove the softlockup_tick function as it is no longer needed. Also remove the /proc softlockup_thres call as it has been changed to watchdog_thres.
Unified · Split
| @@ -312,19 +312,15 @@ extern void scheduler_tick(void); · 311 unmodified lines | ||
| 312 | 312 | extern void sched_show_task(struct task_struct *p); |
| 313 | 313 | |
| 314 | 314 | #ifdef CONFIG_DETECT_SOFTLOCKUP |
| 315 | −extern void softlockup_tick(void); | |
| 316 | 315 | extern void touch_softlockup_watchdog(void); |
| 317 | 316 | extern void touch_softlockup_watchdog_sync(void); |
| 318 | 317 | extern void touch_all_softlockup_watchdogs(void); |
| 319 | −extern int proc_dosoftlockup_thresh(struct ctl_table *table, int write, | |
| 320 | − void __user *buffer, | |
| 321 | − size_t *lenp, loff_t *ppos); | |
| 318 | +extern int proc_dowatchdog_thresh(struct ctl_table *table, int write, | |
| 319 | + void __user *buffer, | |
| 320 | + size_t *lenp, loff_t *ppos); | |
| 322 | 321 | extern unsigned int softlockup_panic; |
| 323 | 322 | extern int softlockup_thresh; |
| 324 | 323 | #else |
| 325 | −static inline void softlockup_tick(void) | |
| 326 | −{ | |
| 327 | −} | |
| 328 | 324 | static inline void touch_softlockup_watchdog(void) |
| 329 | 325 | { |
| 330 | 326 | } |
| @@ -346,12 +342,6 @@ extern int proc_dohung_task_timeout_secs(struct ctl_table *table, int write, · 15 unmodified lines | ||
| 346 | 342 | size_t *lenp, loff_t *ppos); |
| 347 | 343 | #endif |
| 348 | 344 | |
| 349 | −#ifdef CONFIG_LOCKUP_DETECTOR | |
| 350 | −extern int proc_dowatchdog_thresh(struct ctl_table *table, int write, | |
| 351 | − void __user *buffer, | |
| 352 | − size_t *lenp, loff_t *ppos); | |
| 353 | −#endif | |
| 354 | − | |
| 355 | 345 | /* Attach to any functions which should be ignored in wchan output. */ |
| 356 | 346 | #define __sched __attribute__((__section__(".sched.text"))) |
| 357 | 347 | |
| @@ -817,15 +817,6 @@ static struct ctl_table kern_table[] = { · 816 unmodified lines | ||
| 817 | 817 | .extra1 = &zero, |
| 818 | 818 | .extra2 = &one, |
| 819 | 819 | }, |
| 820 | − { | |
| 821 | − .procname = "softlockup_thresh", | |
| 822 | − .data = &softlockup_thresh, | |
| 823 | − .maxlen = sizeof(int), | |
| 824 | − .mode = 0644, | |
| 825 | − .proc_handler = proc_dosoftlockup_thresh, | |
| 826 | − .extra1 = &neg_one, | |
| 827 | − .extra2 = &sixty, | |
| 828 | − }, | |
| 829 | 820 | #endif |
| 830 | 821 | #ifdef CONFIG_DETECT_HUNG_TASK |
| 831 | 822 | { |
| @@ -1225,7 +1225,6 @@ void run_local_timers(void) · 1224 unmodified lines | ||
| 1225 | 1225 | { |
| 1226 | 1226 | hrtimer_run_queues(); |
| 1227 | 1227 | raise_softirq(TIMER_SOFTIRQ); |
| 1228 | − softlockup_tick(); | |
| 1229 | 1228 | } |
| 1230 | 1229 | |
| 1231 | 1230 | /* |
| @@ -119,13 +119,12 @@ static void __touch_watchdog(void) · 118 unmodified lines | ||
| 119 | 119 | __get_cpu_var(watchdog_touch_ts) = get_timestamp(this_cpu); |
| 120 | 120 | } |
| 121 | 121 | |
| 122 | −void touch_watchdog(void) | |
| 122 | +void touch_softlockup_watchdog(void) | |
| 123 | 123 | { |
| 124 | 124 | __get_cpu_var(watchdog_touch_ts) = 0; |
| 125 | 125 | } |
| 126 | −EXPORT_SYMBOL(touch_watchdog); | |
| 127 | 126 | |
| 128 | −void touch_all_watchdog(void) | |
| 127 | +void touch_all_softlockup_watchdogs(void) | |
| 129 | 128 | { |
| 130 | 129 | int cpu; |
| 131 | 130 | |
| @@ -140,35 +139,16 @@ void touch_all_watchdog(void) · 8 unmodified lines | ||
| 140 | 139 | |
| 141 | 140 | void touch_nmi_watchdog(void) |
| 142 | 141 | { |
| 143 | − touch_watchdog(); | |
| 142 | + touch_softlockup_watchdog(); | |
| 144 | 143 | } |
| 145 | 144 | EXPORT_SYMBOL(touch_nmi_watchdog); |
| 146 | 145 | |
| 147 | −void touch_all_nmi_watchdog(void) | |
| 148 | −{ | |
| 149 | − touch_all_watchdog(); | |
| 150 | −} | |
| 151 | − | |
| 152 | −void touch_softlockup_watchdog(void) | |
| 153 | −{ | |
| 154 | − touch_watchdog(); | |
| 155 | −} | |
| 156 | − | |
| 157 | −void touch_all_softlockup_watchdogs(void) | |
| 158 | −{ | |
| 159 | − touch_all_watchdog(); | |
| 160 | −} | |
| 161 | − | |
| 162 | 146 | void touch_softlockup_watchdog_sync(void) |
| 163 | 147 | { |
| 164 | 148 | __raw_get_cpu_var(softlockup_touch_sync) = true; |
| 165 | 149 | __raw_get_cpu_var(watchdog_touch_ts) = 0; |
| 166 | 150 | } |
| 167 | 151 | |
| 168 | −void softlockup_tick(void) | |
| 169 | −{ | |
| 170 | −} | |
| 171 | − | |
| 172 | 152 | #ifdef CONFIG_PERF_EVENTS_NMI |
| 173 | 153 | /* watchdog detector functions */ |
| 174 | 154 | static int is_hardlockup(int cpu) |
| @@ -522,15 +502,6 @@ int proc_dowatchdog_thresh(struct ctl_table *table, int write, · 347 unmodified lines | ||
| 522 | 502 | { |
| 523 | 503 | return proc_dointvec_minmax(table, write, buffer, lenp, ppos); |
| 524 | 504 | } |
| 525 | − | |
| 526 | −/* stub functions */ | |
| 527 | −int proc_dosoftlockup_thresh(struct ctl_table *table, int write, | |
| 528 | − void __user *buffer, | |
| 529 | − size_t *lenp, loff_t *ppos) | |
| 530 | −{ | |
| 531 | − return proc_dowatchdog_thresh(table, write, buffer, lenp, ppos); | |
| 532 | −} | |
| 533 | −/* end of stub functions */ | |
| 534 | 505 | #endif /* CONFIG_SYSCTL */ |
| 535 | 506 | |
| 536 | 507 | |