diff options
author | Ingo Molnar <mingo@elte.hu> | 2007-10-17 02:26:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 11:42:47 -0400 |
commit | a5f2ce3c6024a5bb895647b6bd88ecae5001020a (patch) | |
tree | 10bb864bc252489ce6c7070796a6e7966982bb23 /kernel | |
parent | 43581a10075492445f65234384210492ff333eba (diff) |
softlockup watchdog: style cleanups
kernel/softirq.c grew a few style uncleanlinesses in the past few
months, clean that up. No functional changes:
text data bss dec hex filename
1126 76 4 1206 4b6 softlockup.o.before
1129 76 4 1209 4b9 softlockup.o.after
( the 3 bytes .text increase is due to the "<1>" appended to one of
the printk messages. )
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/softlockup.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/softlockup.c b/kernel/softlockup.c index 65839c54abf5..72c2561ff5f8 100644 --- a/kernel/softlockup.c +++ b/kernel/softlockup.c | |||
@@ -23,7 +23,7 @@ static DEFINE_PER_CPU(unsigned long, touch_timestamp); | |||
23 | static DEFINE_PER_CPU(unsigned long, print_timestamp); | 23 | static DEFINE_PER_CPU(unsigned long, print_timestamp); |
24 | static DEFINE_PER_CPU(struct task_struct *, watchdog_task); | 24 | static DEFINE_PER_CPU(struct task_struct *, watchdog_task); |
25 | 25 | ||
26 | static int did_panic = 0; | 26 | static int did_panic; |
27 | 27 | ||
28 | static int | 28 | static int |
29 | softlock_panic(struct notifier_block *this, unsigned long event, void *ptr) | 29 | softlock_panic(struct notifier_block *this, unsigned long event, void *ptr) |
@@ -121,7 +121,7 @@ void softlockup_tick(void) | |||
121 | /* | 121 | /* |
122 | * The watchdog thread - runs every second and touches the timestamp. | 122 | * The watchdog thread - runs every second and touches the timestamp. |
123 | */ | 123 | */ |
124 | static int watchdog(void * __bind_cpu) | 124 | static int watchdog(void *__bind_cpu) |
125 | { | 125 | { |
126 | struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 }; | 126 | struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 }; |
127 | 127 | ||
@@ -159,13 +159,13 @@ cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) | |||
159 | BUG_ON(per_cpu(watchdog_task, hotcpu)); | 159 | BUG_ON(per_cpu(watchdog_task, hotcpu)); |
160 | p = kthread_create(watchdog, hcpu, "watchdog/%d", hotcpu); | 160 | p = kthread_create(watchdog, hcpu, "watchdog/%d", hotcpu); |
161 | if (IS_ERR(p)) { | 161 | if (IS_ERR(p)) { |
162 | printk("watchdog for %i failed\n", hotcpu); | 162 | printk(KERN_ERR "watchdog for %i failed\n", hotcpu); |
163 | return NOTIFY_BAD; | 163 | return NOTIFY_BAD; |
164 | } | 164 | } |
165 | per_cpu(touch_timestamp, hotcpu) = 0; | 165 | per_cpu(touch_timestamp, hotcpu) = 0; |
166 | per_cpu(watchdog_task, hotcpu) = p; | 166 | per_cpu(watchdog_task, hotcpu) = p; |
167 | kthread_bind(p, hotcpu); | 167 | kthread_bind(p, hotcpu); |
168 | break; | 168 | break; |
169 | case CPU_ONLINE: | 169 | case CPU_ONLINE: |
170 | case CPU_ONLINE_FROZEN: | 170 | case CPU_ONLINE_FROZEN: |
171 | wake_up_process(per_cpu(watchdog_task, hotcpu)); | 171 | wake_up_process(per_cpu(watchdog_task, hotcpu)); |
@@ -185,7 +185,7 @@ cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) | |||
185 | kthread_stop(p); | 185 | kthread_stop(p); |
186 | break; | 186 | break; |
187 | #endif /* CONFIG_HOTPLUG_CPU */ | 187 | #endif /* CONFIG_HOTPLUG_CPU */ |
188 | } | 188 | } |
189 | return NOTIFY_OK; | 189 | return NOTIFY_OK; |
190 | } | 190 | } |
191 | 191 | ||