diff options
Diffstat (limited to 'meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.34-ondemand-fix-4-7.patch')
| -rw-r--r-- | meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.34-ondemand-fix-4-7.patch | 89 |
1 files changed, 89 insertions, 0 deletions
diff --git a/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.34-ondemand-fix-4-7.patch b/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.34-ondemand-fix-4-7.patch new file mode 100644 index 0000000000..201b53c2df --- /dev/null +++ b/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.34-ondemand-fix-4-7.patch @@ -0,0 +1,89 @@ +>From e75d6cd203e43ea4c5e9919f19e2882c066491b8 Mon Sep 17 00:00:00 2001 +From: Arjan van de Ven <arjan@linux.intel.com> +Date: Sun, 18 Apr 2010 10:47:02 -0700 +Subject: [PATCH 4/7] sched: fold updating of the last update time into update_ts_time_stats() +Patch-mainline: in -mm tree as of 19 Apr 2010 + +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: Arjan van de Ven <arjan@linux.intel.com> +--- + kernel/time/tick-sched.c | 22 +++++++++++----------- + 1 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c +index 7dbad2f..ac54543 100644 +--- a/kernel/time/tick-sched.c ++++ b/kernel/time/tick-sched.c +@@ -153,7 +153,8 @@ static void tick_nohz_update_jiffies(ktime_t now) + /* + * 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; + +@@ -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_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) + { + 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; + + sched_clock_idle_wakeup_event(0); +@@ -181,7 +188,7 @@ static ktime_t tick_nohz_start_idle(struct tick_sched *ts) + + now = ktime_get(); + +- update_ts_time_stats(ts, now); ++ update_ts_time_stats(ts, now, NULL); + + ts->idle_entrytime = now; + 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) + { + struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu); +- ktime_t now; + + if (!tick_nohz_enabled) + return -1; + +- now = ktime_get(); +- 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); ++ update_ts_time_stats(ts, ktime_get(), last_update_time); + + return ktime_to_us(ts->idle_sleeptime); + } +-- +1.6.2.5 + +-- +To unsubscribe from this list: send the line "unsubscribe linux-kernel" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html +Please read the FAQ at http://www.tux.org/lkml/ + |