diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/module.c | 2 | ||||
-rw-r--r-- | kernel/softirq.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/kernel/module.c b/kernel/module.c index 1f0657ae555b..f0e04d6b67d8 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
@@ -381,7 +381,7 @@ static void *percpu_modalloc(unsigned long size, unsigned long align, | |||
381 | align = PAGE_SIZE; | 381 | align = PAGE_SIZE; |
382 | } | 382 | } |
383 | 383 | ||
384 | ptr = __alloc_percpu(size, align); | 384 | ptr = __alloc_reserved_percpu(size, align); |
385 | if (!ptr) | 385 | if (!ptr) |
386 | printk(KERN_WARNING | 386 | printk(KERN_WARNING |
387 | "Could not allocate %lu bytes percpu data\n", size); | 387 | "Could not allocate %lu bytes percpu data\n", size); |
diff --git a/kernel/softirq.c b/kernel/softirq.c index 0365b4899a3d..57d3f67f6f38 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
@@ -626,6 +626,7 @@ static int ksoftirqd(void * __bind_cpu) | |||
626 | preempt_enable_no_resched(); | 626 | preempt_enable_no_resched(); |
627 | cond_resched(); | 627 | cond_resched(); |
628 | preempt_disable(); | 628 | preempt_disable(); |
629 | rcu_qsctr_inc((long)__bind_cpu); | ||
629 | } | 630 | } |
630 | preempt_enable(); | 631 | preempt_enable(); |
631 | set_current_state(TASK_INTERRUPTIBLE); | 632 | set_current_state(TASK_INTERRUPTIBLE); |