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 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
kernel
/
sched_stats.h
diff --git
a/kernel/sched_stats.h
b/kernel/sched_stats.h
index
48ddf43
..
331e01b
100644
(file)
--- a/
kernel/sched_stats.h
+++ b/
kernel/sched_stats.h
@@
-37,7
+37,7
@@
static int show_schedstat(struct seq_file *seq, void *v)
#ifdef CONFIG_SMP
/* domain-specific stats */
#ifdef CONFIG_SMP
/* domain-specific stats */
-
preempt_disable
();
+
rcu_read_lock
();
for_each_domain(cpu, sd) {
enum cpu_idle_type itype;
for_each_domain(cpu, sd) {
enum cpu_idle_type itype;
@@
-64,7
+64,7
@@
static int show_schedstat(struct seq_file *seq, void *v)
sd->ttwu_wake_remote, sd->ttwu_move_affine,
sd->ttwu_move_balance);
}
sd->ttwu_wake_remote, sd->ttwu_move_affine,
sd->ttwu_move_balance);
}
-
preempt_enable
();
+
rcu_read_unlock
();
#endif
}
kfree(mask_str);
#endif
}
kfree(mask_str);