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 commit 'v2.6.37-rc2' into sched/core
[pandora-kernel.git]
/
kernel
/
softirq.c
diff --git
a/kernel/softirq.c
b/kernel/softirq.c
index
f02a9df
..
d4d918a
100644
(file)
--- a/
kernel/softirq.c
+++ b/
kernel/softirq.c
@@
-229,18
+229,20
@@
restart:
do {
if (pending & 1) {
do {
if (pending & 1) {
+ unsigned int vec_nr = h - softirq_vec;
int prev_count = preempt_count();
int prev_count = preempt_count();
- kstat_incr_softirqs_this_cpu(h - softirq_vec);
- trace_softirq_entry(h, softirq_vec);
+ kstat_incr_softirqs_this_cpu(vec_nr);
+
+ trace_softirq_entry(vec_nr);
h->action(h);
h->action(h);
- trace_softirq_exit(
h, softirq_vec
);
+ trace_softirq_exit(
vec_nr
);
if (unlikely(prev_count != preempt_count())) {
if (unlikely(prev_count != preempt_count())) {
- printk(KERN_ERR "huh, entered softirq %
td
%s %p"
+ printk(KERN_ERR "huh, entered softirq %
u
%s %p"
"with preempt_count %08x,"
"with preempt_count %08x,"
- " exited with %08x?\n",
h - softirq_vec
,
- softirq_to_name[
h - softirq_vec]
,
-
h->action,
prev_count, preempt_count());
+ " exited with %08x?\n",
vec_nr
,
+ softirq_to_name[
vec_nr], h->action
,
+ prev_count, preempt_count());
preempt_count() = prev_count;
}
preempt_count() = prev_count;
}
@@
-851,7
+853,9
@@
static int __cpuinit cpu_callback(struct notifier_block *nfb,
cpumask_any(cpu_online_mask));
case CPU_DEAD:
case CPU_DEAD_FROZEN: {
cpumask_any(cpu_online_mask));
case CPU_DEAD:
case CPU_DEAD_FROZEN: {
- struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 };
+ static struct sched_param param = {
+ .sched_priority = MAX_RT_PRIO-1
+ };
p = per_cpu(ksoftirqd, hotcpu);
per_cpu(ksoftirqd, hotcpu) = NULL;
p = per_cpu(ksoftirqd, hotcpu);
per_cpu(ksoftirqd, hotcpu) = NULL;