mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
Merge branch 'generic-ipi' into generic-ipi-for-linus
Conflicts: arch/powerpc/Kconfig arch/s390/kernel/time.c arch/x86/kernel/apic_32.c arch/x86/kernel/cpu/perfctr-watchdog.c arch/x86/kernel/i8259_64.c arch/x86/kernel/ldt.c arch/x86/kernel/nmi_64.c arch/x86/kernel/smpboot.c arch/x86/xen/smp.c include/asm-x86/hw_irq_32.h include/asm-x86/hw_irq_64.h include/asm-x86/mach-default/irq_vectors.h include/asm-x86/mach-voyager/irq_vectors.h include/asm-x86/smp.h kernel/Makefile Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
commit
1a781a777b
125 changed files with 881 additions and 1787 deletions
|
|
@ -2446,7 +2446,7 @@ static void drain_cpu_caches(struct kmem_cache *cachep)
|
|||
struct kmem_list3 *l3;
|
||||
int node;
|
||||
|
||||
on_each_cpu(do_drain, cachep, 1, 1);
|
||||
on_each_cpu(do_drain, cachep, 1);
|
||||
check_irq_on();
|
||||
for_each_online_node(node) {
|
||||
l3 = cachep->nodelists[node];
|
||||
|
|
@ -3931,7 +3931,7 @@ static int do_tune_cpucache(struct kmem_cache *cachep, int limit,
|
|||
}
|
||||
new->cachep = cachep;
|
||||
|
||||
on_each_cpu(do_ccupdate_local, (void *)new, 1, 1);
|
||||
on_each_cpu(do_ccupdate_local, (void *)new, 1);
|
||||
|
||||
check_irq_on();
|
||||
cachep->batchcount = batchcount;
|
||||
|
|
|
|||
Loading…
Reference in a new issue