Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

softlockup watchdog: style cleanups

Browse source 
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>
This commit is contained in:
Ingo Molnar 2007-10-16 23:26:08 -07:00 committed by Linus Torvalds
parent 43581a1007
commit a5f2ce3c60
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
kernel/softlockup.c
View file

@ -23,7 +23,7 @@ static DEFINE_PER_CPU(unsigned long, touch_timestamp);
static DEFINE_PER_CPU(unsigned long, print_timestamp); static DEFINE_PER_CPU(unsigned long, print_timestamp);
static DEFINE_PER_CPU(struct task_struct *, watchdog_task); static DEFINE_PER_CPU(struct task_struct *, watchdog_task);
static int did_panic = 0; static int did_panic;
static int static int
softlock_panic(struct notifier_block *this, unsigned long event, void *ptr) softlock_panic(struct notifier_block *this, unsigned long event, void *ptr)
@ -121,7 +121,7 @@ void softlockup_tick(void)
/* /*
* The watchdog thread - runs every second and touches the timestamp. * The watchdog thread - runs every second and touches the timestamp.
*/ */
static int watchdog(void * __bind_cpu) static int watchdog(void *__bind_cpu)
{ {
struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 }; struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 };
@ -159,13 +159,13 @@ cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
BUG_ON(per_cpu(watchdog_task, hotcpu)); BUG_ON(per_cpu(watchdog_task, hotcpu));
p = kthread_create(watchdog, hcpu, "watchdog/%d", hotcpu); p = kthread_create(watchdog, hcpu, "watchdog/%d", hotcpu);
if (IS_ERR(p)) { if (IS_ERR(p)) {
printk("watchdog for %i failed\n", hotcpu); printk(KERN_ERR "watchdog for %i failed\n", hotcpu);
return NOTIFY_BAD; return NOTIFY_BAD;
} }
per_cpu(touch_timestamp, hotcpu) = 0; per_cpu(touch_timestamp, hotcpu) = 0;
per_cpu(watchdog_task, hotcpu) = p; per_cpu(watchdog_task, hotcpu) = p;
kthread_bind(p, hotcpu); kthread_bind(p, hotcpu);
break; break;
case CPU_ONLINE: case CPU_ONLINE:
case CPU_ONLINE_FROZEN: case CPU_ONLINE_FROZEN:
wake_up_process(per_cpu(watchdog_task, hotcpu)); wake_up_process(per_cpu(watchdog_task, hotcpu));
@ -185,7 +185,7 @@ cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
kthread_stop(p); kthread_stop(p);
break; break;
#endif /* CONFIG_HOTPLUG_CPU */ #endif /* CONFIG_HOTPLUG_CPU */
} }
return NOTIFY_OK; return NOTIFY_OK;
} }