Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d63bf94 authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Ingo Molnar
Browse files

sched: Fold updating of the last_update_time_info into update_ts_time_stats() 



This patch folds the updating of the last_update_time into the
update_ts_time_stats() function, and updates the callers.

This allows for further cleanups that are done in the next
patch.

Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarRik van Riel <riel@redhat.com>
Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: davej@redhat.com
LKML-Reference: <20100509082403.60072967@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8c7b09f4

kernel/time/tick-sched.c

+11 −11
Original line number Original line Diff line number Diff line
@@ -153,7 +153,8 @@ static void tick_nohz_update_jiffies(ktime_t now) 
/*

/*

 * Updates the per cpu time idle statistics counters

 * Updates the per cpu time idle statistics counters

 */

 */

static void update_ts_time_stats(struct tick_sched *ts, ktime_t now)

static void

update_ts_time_stats(struct tick_sched *ts, ktime_t now, u64 *last_update_time)

{

{

	ktime_t delta;

	ktime_t delta;
@@ -163,13 +164,19 @@ static void update_ts_time_stats(struct tick_sched *ts, ktime_t now) 
		ts->idle_sleeptime = ktime_add(ts->idle_sleeptime, delta);

		ts->idle_sleeptime = ktime_add(ts->idle_sleeptime, delta);

		ts->idle_entrytime = now;

		ts->idle_entrytime = now;

	}

	}



	if (ts->idle_active && last_update_time)

		*last_update_time = ktime_to_us(ts->idle_lastupdate);

	else

		*last_update_time = ktime_to_us(now);



}

}





static void tick_nohz_stop_idle(int cpu, ktime_t now)

static void tick_nohz_stop_idle(int cpu, ktime_t now)

{

{

	struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu);

	struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu);





	update_ts_time_stats(ts, now);

	update_ts_time_stats(ts, now, NULL);

	ts->idle_active = 0;

	ts->idle_active = 0;





	sched_clock_idle_wakeup_event(0);

	sched_clock_idle_wakeup_event(0);
@@ -181,7 +188,7 @@ static ktime_t tick_nohz_start_idle(struct tick_sched *ts) 




	now = ktime_get();

	now = ktime_get();





	update_ts_time_stats(ts, now);

	update_ts_time_stats(ts, now, NULL);





	ts->idle_entrytime = now;

	ts->idle_entrytime = now;

	ts->idle_active = 1;

	ts->idle_active = 1;
@@ -206,18 +213,11 @@ static ktime_t tick_nohz_start_idle(struct tick_sched *ts) 
u64 get_cpu_idle_time_us(int cpu, u64 *last_update_time)

u64 get_cpu_idle_time_us(int cpu, u64 *last_update_time)

{

{

	struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu);

	struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu);

	ktime_t now;





	if (!tick_nohz_enabled)

	if (!tick_nohz_enabled)

		return -1;

		return -1;





	now = ktime_get();

	update_ts_time_stats(ts, ktime_get(), last_update_time);

	update_ts_time_stats(ts, now);



	if (ts->idle_active)

		*last_update_time = ktime_to_us(ts->idle_lastupdate);

	else

		*last_update_time = ktime_to_us(now);





	return ktime_to_us(ts->idle_sleeptime);

	return ktime_to_us(ts->idle_sleeptime);

}

}