projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
powerpc: Emulate most Book I instructions in emulate_step()
[deliverable/linux.git]
/
kernel
/
sched.c
diff --git
a/kernel/sched.c
b/kernel/sched.c
index d484081425037b5b59ce076c03f524ead13ec37b..f8b8996228dd7d8de9ee49a845a193921f1b8a5d 100644
(file)
--- a/
kernel/sched.c
+++ b/
kernel/sched.c
@@
-544,6
+544,8
@@
struct rq {
struct root_domain *rd;
struct sched_domain *sd;
struct root_domain *rd;
struct sched_domain *sd;
+ unsigned long cpu_power;
+
unsigned char idle_at_tick;
/* For active balancing */
int post_schedule;
unsigned char idle_at_tick;
/* For active balancing */
int post_schedule;
@@
-1499,24
+1501,9
@@
static unsigned long target_load(int cpu, int type)
return max(rq->cpu_load[type-1], total);
}
return max(rq->cpu_load[type-1], total);
}
-static struct sched_group *group_of(int cpu)
-{
- struct sched_domain *sd = rcu_dereference_sched(cpu_rq(cpu)->sd);
-
- if (!sd)
- return NULL;
-
- return sd->groups;
-}
-
static unsigned long power_of(int cpu)
{
static unsigned long power_of(int cpu)
{
- struct sched_group *group = group_of(cpu);
-
- if (!group)
- return SCHED_LOAD_SCALE;
-
- return group->cpu_power;
+ return cpu_rq(cpu)->cpu_power;
}
static int task_hot(struct task_struct *p, u64 now, struct sched_domain *sd);
}
static int task_hot(struct task_struct *p, u64 now, struct sched_domain *sd);
@@
-1854,8
+1841,8
@@
static void dec_nr_running(struct rq *rq)
static void set_load_weight(struct task_struct *p)
{
if (task_has_rt_policy(p)) {
static void set_load_weight(struct task_struct *p)
{
if (task_has_rt_policy(p)) {
- p->se.load.weight =
prio_to_weight[0] * 2
;
- p->se.load.inv_weight =
prio_to_wmult[0] >> 1
;
+ p->se.load.weight =
0
;
+ p->se.load.inv_weight =
WMULT_CONST
;
return;
}
return;
}
@@
-7605,6
+7592,7
@@
void __init sched_init(void)
#ifdef CONFIG_SMP
rq->sd = NULL;
rq->rd = NULL;
#ifdef CONFIG_SMP
rq->sd = NULL;
rq->rd = NULL;
+ rq->cpu_power = SCHED_LOAD_SCALE;
rq->post_schedule = 0;
rq->active_balance = 0;
rq->next_balance = jiffies;
rq->post_schedule = 0;
rq->active_balance = 0;
rq->next_balance = jiffies;
This page took
0.032998 seconds
and
5
git commands to generate.