git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[pandora-kernel.git]
/
kernel
/
sched_debug.c
diff --git
a/kernel/sched_debug.c
b/kernel/sched_debug.c
index
467ca72
..
70c7e0b
100644
(file)
--- a/
kernel/sched_debug.c
+++ b/
kernel/sched_debug.c
@@
-162,7
+162,7
@@
void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
{
s64 MIN_vruntime = -1, min_vruntime, max_vruntime = -1,
spread, rq0_min_vruntime, spread0;
{
s64 MIN_vruntime = -1, min_vruntime, max_vruntime = -1,
spread, rq0_min_vruntime, spread0;
- struct rq *rq =
&per_cpu(runqueues,
cpu);
+ struct rq *rq =
cpu_rq(
cpu);
struct sched_entity *last;
unsigned long flags;
struct sched_entity *last;
unsigned long flags;
@@
-191,7
+191,7
@@
void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
if (last)
max_vruntime = last->vruntime;
min_vruntime = cfs_rq->min_vruntime;
if (last)
max_vruntime = last->vruntime;
min_vruntime = cfs_rq->min_vruntime;
- rq0_min_vruntime =
per_cpu(runqueues, 0).
cfs.min_vruntime;
+ rq0_min_vruntime =
cpu_rq(0)->
cfs.min_vruntime;
spin_unlock_irqrestore(&rq->lock, flags);
SEQ_printf(m, " .%-30s: %Ld.%06ld\n", "MIN_vruntime",
SPLIT_NS(MIN_vruntime));
spin_unlock_irqrestore(&rq->lock, flags);
SEQ_printf(m, " .%-30s: %Ld.%06ld\n", "MIN_vruntime",
SPLIT_NS(MIN_vruntime));
@@
-248,7
+248,7
@@
void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq)
static void print_cpu(struct seq_file *m, int cpu)
{
static void print_cpu(struct seq_file *m, int cpu)
{
- struct rq *rq =
&per_cpu(runqueues,
cpu);
+ struct rq *rq =
cpu_rq(
cpu);
#ifdef CONFIG_X86
{
#ifdef CONFIG_X86
{