projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tools headers UAPI: Synch KVM's svm.h header with the kernel
[linux-2.6-microblaze.git]
/
kernel
/
sched
/
cpuacct.c
diff --git
a/kernel/sched/cpuacct.c
b/kernel/sched/cpuacct.c
index
104a1ba
..
893eece
100644
(file)
--- a/
kernel/sched/cpuacct.c
+++ b/
kernel/sched/cpuacct.c
@@
-112,7
+112,7
@@
static u64 cpuacct_cpuusage_read(struct cpuacct *ca, int cpu,
/*
* Take rq->lock to make 64-bit read safe on 32-bit platforms.
*/
/*
* Take rq->lock to make 64-bit read safe on 32-bit platforms.
*/
- raw_spin_
lock_irq(&cpu_rq(cpu)->lock
);
+ raw_spin_
rq_lock_irq(cpu_rq(cpu)
);
#endif
if (index == CPUACCT_STAT_NSTATS) {
#endif
if (index == CPUACCT_STAT_NSTATS) {
@@
-126,7
+126,7
@@
static u64 cpuacct_cpuusage_read(struct cpuacct *ca, int cpu,
}
#ifndef CONFIG_64BIT
}
#ifndef CONFIG_64BIT
- raw_spin_
unlock_irq(&cpu_rq(cpu)->lock
);
+ raw_spin_
rq_unlock_irq(cpu_rq(cpu)
);
#endif
return data;
#endif
return data;
@@
-141,14
+141,14
@@
static void cpuacct_cpuusage_write(struct cpuacct *ca, int cpu, u64 val)
/*
* Take rq->lock to make 64-bit write safe on 32-bit platforms.
*/
/*
* Take rq->lock to make 64-bit write safe on 32-bit platforms.
*/
- raw_spin_
lock_irq(&cpu_rq(cpu)->lock
);
+ raw_spin_
rq_lock_irq(cpu_rq(cpu)
);
#endif
for (i = 0; i < CPUACCT_STAT_NSTATS; i++)
cpuusage->usages[i] = val;
#ifndef CONFIG_64BIT
#endif
for (i = 0; i < CPUACCT_STAT_NSTATS; i++)
cpuusage->usages[i] = val;
#ifndef CONFIG_64BIT
- raw_spin_
unlock_irq(&cpu_rq(cpu)->lock
);
+ raw_spin_
rq_unlock_irq(cpu_rq(cpu)
);
#endif
}
#endif
}
@@
-253,13
+253,13
@@
static int cpuacct_all_seq_show(struct seq_file *m, void *V)
* Take rq->lock to make 64-bit read safe on 32-bit
* platforms.
*/
* Take rq->lock to make 64-bit read safe on 32-bit
* platforms.
*/
- raw_spin_
lock_irq(&cpu_rq(cpu)->lock
);
+ raw_spin_
rq_lock_irq(cpu_rq(cpu)
);
#endif
seq_printf(m, " %llu", cpuusage->usages[index]);
#ifndef CONFIG_64BIT
#endif
seq_printf(m, " %llu", cpuusage->usages[index]);
#ifndef CONFIG_64BIT
- raw_spin_
unlock_irq(&cpu_rq(cpu)->lock
);
+ raw_spin_
rq_unlock_irq(cpu_rq(cpu)
);
#endif
}
seq_puts(m, "\n");
#endif
}
seq_puts(m, "\n");