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 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
kernel
/
softirq.c
diff --git
a/kernel/softirq.c
b/kernel/softirq.c
index
7c1a67e
..
0db913a
100644
(file)
--- a/
kernel/softirq.c
+++ b/
kernel/softirq.c
@@
-716,7
+716,7
@@
static int run_ksoftirqd(void * __bind_cpu)
preempt_enable_no_resched();
cond_resched();
preempt_disable();
- rcu_
sched_qs
((long)__bind_cpu);
+ rcu_
note_context_switch
((long)__bind_cpu);
}
preempt_enable();
set_current_state(TASK_INTERRUPTIBLE);