Commit ec47eadd authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] balanced_irq warning fix

arch/i386/kernel/io_apic.c: In function `balanced_irq':
arch/i386/kernel/io_apic.c:582: warning: no return statement in function returning non-void

and clean things up a bit
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 86500b9f
...@@ -555,7 +555,7 @@ static void do_irq_balance(void) ...@@ -555,7 +555,7 @@ static void do_irq_balance(void)
return; return;
} }
int balanced_irq(void *unused) static int balanced_irq(void *unused)
{ {
int i; int i;
unsigned long prev_balance_time = jiffies; unsigned long prev_balance_time = jiffies;
...@@ -568,17 +568,17 @@ int balanced_irq(void *unused) ...@@ -568,17 +568,17 @@ int balanced_irq(void *unused)
pending_irq_balance_cpumask[i] = cpumask_of_cpu(0); pending_irq_balance_cpumask[i] = cpumask_of_cpu(0);
} }
repeat: for ( ; ; ) {
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
time_remaining = schedule_timeout(time_remaining); time_remaining = schedule_timeout(time_remaining);
if (time_after(jiffies, prev_balance_time+balanced_irq_interval)) { if (time_after(jiffies,
Dprintk("balanced_irq: calling do_irq_balance() %lu\n", prev_balance_time+balanced_irq_interval)) {
jiffies); do_irq_balance();
do_irq_balance(); prev_balance_time = jiffies;
prev_balance_time = jiffies; time_remaining = balanced_irq_interval;
time_remaining = balanced_irq_interval; }
} }
goto repeat; return 0;
} }
static int __init balanced_irq_init(void) static int __init balanced_irq_init(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment