mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 06:03:36 -04:00
Merge branches 'x86/apic', 'x86/asm', 'x86/fixmap', 'x86/memtest', 'x86/mm', 'x86/urgent', 'linus' and 'core/percpu' into x86/core
This commit is contained in:
commit
467c88fee5
143 changed files with 2069 additions and 2156 deletions
|
|
@ -381,7 +381,7 @@ static void *percpu_modalloc(unsigned long size, unsigned long align,
|
|||
align = PAGE_SIZE;
|
||||
}
|
||||
|
||||
ptr = __alloc_percpu(size, align);
|
||||
ptr = __alloc_reserved_percpu(size, align);
|
||||
if (!ptr)
|
||||
printk(KERN_WARNING
|
||||
"Could not allocate %lu bytes percpu data\n", size);
|
||||
|
|
|
|||
|
|
@ -626,6 +626,7 @@ static int ksoftirqd(void * __bind_cpu)
|
|||
preempt_enable_no_resched();
|
||||
cond_resched();
|
||||
preempt_disable();
|
||||
rcu_qsctr_inc((long)__bind_cpu);
|
||||
}
|
||||
preempt_enable();
|
||||
set_current_state(TASK_INTERRUPTIBLE);
|
||||
|
|
|
|||
Loading…
Reference in a new issue