History

lockup_detector: Touch_softlockup cleanups and softlockup_tick removal

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.

Don Zickus committed 16 years ago

Commit 332fbdb1 parent 58687ac4 files · +6 −55Browse files

Unified · Split

4 files
  1. include/linux/sched.h +3 −13
  2. kernel/sysctl.c +0 −9
  3. kernel/timer.c +0 −1
  4. kernel/watchdog.c +3 −32
include/linux/sched.h+3−13
@@ -312,19 +312,15 @@ extern void scheduler_tick(void); · 311 unmodified lines
312312 extern void sched_show_task(struct task_struct *p);
313313
314314 #ifdef CONFIG_DETECT_SOFTLOCKUP
315−extern void softlockup_tick(void);
316315 extern void touch_softlockup_watchdog(void);
317316 extern void touch_softlockup_watchdog_sync(void);
318317 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);
322321 extern unsigned int softlockup_panic;
323322 extern int softlockup_thresh;
324323 #else
325−static inline void softlockup_tick(void)
326−{
327−}
328324 static inline void touch_softlockup_watchdog(void)
329325 {
330326 }
@@ -346,12 +342,6 @@ extern int proc_dohung_task_timeout_secs(struct ctl_table *table, int write, · 15 unmodified lines
346342 size_t *lenp, loff_t *ppos);
347343 #endif
348344
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−
355345 /* Attach to any functions which should be ignored in wchan output. */
356346 #define __sched __attribute__((__section__(".sched.text")))
357347
kernel/sysctl.c+0−9
@@ -817,15 +817,6 @@ static struct ctl_table kern_table[] = { · 816 unmodified lines
817817 .extra1 = &zero,
818818 .extra2 = &one,
819819 },
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− },
829820 #endif
830821 #ifdef CONFIG_DETECT_HUNG_TASK
831822 {
kernel/timer.c+0−1
@@ -1225,7 +1225,6 @@ void run_local_timers(void) · 1224 unmodified lines
12251225 {
12261226 hrtimer_run_queues();
12271227 raise_softirq(TIMER_SOFTIRQ);
1228− softlockup_tick();
12291228 }
12301229
12311230 /*
kernel/watchdog.c+3−32
@@ -119,13 +119,12 @@ static void __touch_watchdog(void) · 118 unmodified lines
119119 __get_cpu_var(watchdog_touch_ts) = get_timestamp(this_cpu);
120120 }
121121
122−void touch_watchdog(void)
122+void touch_softlockup_watchdog(void)
123123 {
124124 __get_cpu_var(watchdog_touch_ts) = 0;
125125 }
126−EXPORT_SYMBOL(touch_watchdog);
127126
128−void touch_all_watchdog(void)
127+void touch_all_softlockup_watchdogs(void)
129128 {
130129 int cpu;
131130
@@ -140,35 +139,16 @@ void touch_all_watchdog(void) · 8 unmodified lines
140139
141140 void touch_nmi_watchdog(void)
142141 {
143− touch_watchdog();
142+ touch_softlockup_watchdog();
144143 }
145144 EXPORT_SYMBOL(touch_nmi_watchdog);
146145
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−
162146 void touch_softlockup_watchdog_sync(void)
163147 {
164148 __raw_get_cpu_var(softlockup_touch_sync) = true;
165149 __raw_get_cpu_var(watchdog_touch_ts) = 0;
166150 }
167151
168−void softlockup_tick(void)
169−{
170−}
171−
172152 #ifdef CONFIG_PERF_EVENTS_NMI
173153 /* watchdog detector functions */
174154 static int is_hardlockup(int cpu)
@@ -522,15 +502,6 @@ int proc_dowatchdog_thresh(struct ctl_table *table, int write, · 347 unmodified lines
522502 {
523503 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
524504 }
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 */
534505 #endif /* CONFIG_SYSCTL */
535506
536507

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t