diff options
Diffstat (limited to 'kernel/softirq.c')
| -rw-r--r-- | kernel/softirq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index eb5e131a0485..f8749e5216e0 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
| @@ -57,7 +57,7 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp | |||
| 57 | static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); | 57 | static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); |
| 58 | 58 | ||
| 59 | char *softirq_to_name[NR_SOFTIRQS] = { | 59 | char *softirq_to_name[NR_SOFTIRQS] = { |
| 60 | "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", | 60 | "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL", |
| 61 | "TASKLET", "SCHED", "HRTIMER", "RCU" | 61 | "TASKLET", "SCHED", "HRTIMER", "RCU" |
| 62 | }; | 62 | }; |
| 63 | 63 | ||
| @@ -227,7 +227,7 @@ restart: | |||
| 227 | preempt_count() = prev_count; | 227 | preempt_count() = prev_count; |
| 228 | } | 228 | } |
| 229 | 229 | ||
| 230 | rcu_bh_qsctr_inc(cpu); | 230 | rcu_bh_qs(cpu); |
| 231 | } | 231 | } |
| 232 | h++; | 232 | h++; |
| 233 | pending >>= 1; | 233 | pending >>= 1; |
| @@ -721,7 +721,7 @@ static int ksoftirqd(void * __bind_cpu) | |||
| 721 | preempt_enable_no_resched(); | 721 | preempt_enable_no_resched(); |
| 722 | cond_resched(); | 722 | cond_resched(); |
| 723 | preempt_disable(); | 723 | preempt_disable(); |
| 724 | rcu_qsctr_inc((long)__bind_cpu); | 724 | rcu_sched_qs((long)__bind_cpu); |
| 725 | } | 725 | } |
| 726 | preempt_enable(); | 726 | preempt_enable(); |
| 727 | set_current_state(TASK_INTERRUPTIBLE); | 727 | set_current_state(TASK_INTERRUPTIBLE); |
