From cd1a44203a671a8995ae986965ecf6a8edaf491c Mon Sep 17 00:00:00 2001 From: Andrea Bastoni Date: Tue, 28 Sep 2010 11:10:05 -0400 Subject: Use hrtimer_start_on_info_init() --- litmus/sched_npsf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/litmus/sched_npsf.c b/litmus/sched_npsf.c index 25c71458fa2d..9eb6662e7ae8 100644 --- a/litmus/sched_npsf.c +++ b/litmus/sched_npsf.c @@ -1032,9 +1032,6 @@ void npsf_hrtimers_cleanup(void) for_each_online_cpu(cpu) { entry = &per_cpu(npsf_cpu_entries, cpu); - /* be sure to cleanup pull_timer state */ - atomic_set(&entry->info.state, HRTIMER_START_ON_INACTIVE); - /* if callback active, skip it for now and redo later */ if (hrtimer_try_to_cancel(&entry->timer) == -1) { redo = 1; @@ -1125,6 +1122,10 @@ static long npsf_activate_plugin(void) entry->cpu = cpu; hrtimer_init(&entry->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED); + + /* initialize (reinitialize) pull timers */ + hrtimer_start_on_info_init(&entry->info); + entry->timer.function = reserve_switch_tick; entry->last_seen_npsf_id = -1; } -- cgit v1.2.2