Commit-ID: 106c1cead7c5c073f375de21760a64f97d9fdd6c
Gitweb: http://git.kernel.org/tip/106c1cead7c5c073f375de21760a64f97d9fdd6c
Author: Charles Wang <muming.wq@xxxxxxxxx>
AuthorDate: Mon, 11 Jun 2012 14:14:29 +0800
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Mon, 11 Jun 2012 10:40:40 +0200
sched: Remove unused parameter 'ticks' from calc_global_load()
Parameter "ticks" is not used in calc_global_load() anymore,
so remove it.
( calc_load_account_active() is called from update_cpu_load_active()
instead. )
Signed-off-by: Charles Wang <muming.wq@xxxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Link: http://lkml.kernel.org/r/1339395269-4803-1-git-send-email-muming.wq@xxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
CC: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
---
include/linux/sched.h | 2 +-
kernel/sched/core.c | 4 ++--
kernel/time/timekeeping.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 4059c0f..a368976 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -144,7 +144,7 @@ extern unsigned long nr_iowait_cpu(int cpu);
extern unsigned long this_cpu_load(void);
-extern void calc_global_load(unsigned long ticks);
+extern void calc_global_load(void);
extern void update_cpu_load_nohz(void);
extern unsigned long get_parent_ip(unsigned long addr);
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index d5594a4..dfe673d 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2367,7 +2367,7 @@ void get_avenrun(unsigned long *loads, unsigned long offset, int shift)
* calc_load - update the avenrun load estimates 10 ticks after the
* CPUs have updated calc_load_tasks.
*/
-void calc_global_load(unsigned long ticks)
+void calc_global_load(void)
{
long active;
@@ -2395,7 +2395,7 @@ void calc_global_load(unsigned long ticks)
}
/*
- * Called from update_cpu_load() to periodically update this CPU's
+ * Called from update_cpu_load_active() to periodically update this CPU's
* active count.
*/
static void calc_load_account_active(struct rq *this_rq)
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 6f46a00..87be8c2 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1223,7 +1223,7 @@ void do_timer(unsigned long ticks)
{
jiffies_64 += ticks;
update_wall_time();
- calc_global_load(ticks);
+ calc_global_load();
}
/**
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|