Skip to content

Commit

Permalink
hrtimer: fix HOTPLUG_CPU=n compile warning
Browse files Browse the repository at this point in the history
Impact: cleanup

 kernel/hrtimer.c: In function 'hrtimer_cpu_notify':
 kernel/hrtimer.c:1574: warning: unused variable 'dcpu'

Introduced by commit 3781065
("hrtimer: removing all ur callback modes, fix hotplug") from the
timers.  dcpu is only used if CONFIG_HOTPLUG_CPU is set.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Thomas Gleixner authored and Ingo Molnar committed Jan 5, 2009
1 parent 8bdec95 commit d5fd43c
Showing 1 changed file with 8 additions and 11 deletions.
19 changes: 8 additions & 11 deletions kernel/hrtimer.c
Original file line number Diff line number Diff line change
Expand Up @@ -1504,6 +1504,11 @@ static void __cpuinit init_hrtimers_cpu(int cpu)

#ifdef CONFIG_HOTPLUG_CPU

static void tickle_timers(void *arg)
{
hrtimer_peek_ahead_timers();
}

static void migrate_hrtimer_list(struct hrtimer_clock_base *old_base,
struct hrtimer_clock_base *new_base)
{
Expand Down Expand Up @@ -1539,7 +1544,7 @@ static void migrate_hrtimer_list(struct hrtimer_clock_base *old_base,
}
}

static int migrate_hrtimers(int scpu)
static void migrate_hrtimers(int scpu)
{
struct hrtimer_cpu_base *old_base, *new_base;
int dcpu, i;
Expand Down Expand Up @@ -1567,12 +1572,7 @@ static int migrate_hrtimers(int scpu)
spin_unlock_irq(&new_base->lock);
put_cpu_var(hrtimer_bases);

return dcpu;
}

static void tickle_timers(void *arg)
{
hrtimer_peek_ahead_timers();
smp_call_function_single(dcpu, tickle_timers, NULL, 0);
}

#endif /* CONFIG_HOTPLUG_CPU */
Expand All @@ -1593,11 +1593,8 @@ static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self,
case CPU_DEAD:
case CPU_DEAD_FROZEN:
{
int dcpu;

clockevents_notify(CLOCK_EVT_NOTIFY_CPU_DEAD, &scpu);
dcpu = migrate_hrtimers(scpu);
smp_call_function_single(dcpu, tickle_timers, NULL, 0);
migrate_hrtimers(scpu);
break;
}
#endif
Expand Down

0 comments on commit d5fd43c

Please sign in to comment.