Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (34 commits) m68k: rename global variable vmalloc_end to m68k_vmalloc_end percpu: add missing per_cpu_ptr_to_phys() definition for UP percpu: Fix kdump failure if booted with percpu_alloc=page percpu: make misc percpu symbols unique percpu: make percpu symbols in ia64 unique percpu: make percpu symbols in powerpc unique percpu: make percpu symbols in x86 unique percpu: make percpu symbols in xen unique percpu: make percpu symbols in cpufreq unique percpu: make percpu symbols in oprofile unique percpu: make percpu symbols in tracer unique percpu: make percpu symbols under kernel/ and mm/ unique percpu: remove some sparse warnings percpu: make alloc_percpu() handle array types vmalloc: fix use of non-existent percpu variable in put_cpu_var() this_cpu: Use this_cpu_xx in trace_functions_graph.c this_cpu: Use this_cpu_xx for ftrace this_cpu: Use this_cpu_xx in nmi handling this_cpu: Use this_cpu operations in RCU this_cpu: Use this_cpu ops for VM statistics ... Fix up trivial (famous last words) global per-cpu naming conflicts in arch/x86/kvm/svm.c mm/slab.c
Showing
- arch/ia64/Kconfig 0 additions, 3 deletionsarch/ia64/Kconfig
- arch/ia64/include/asm/meminit.h 1 addition, 1 deletionarch/ia64/include/asm/meminit.h
- arch/ia64/include/asm/pgtable.h 1 addition, 2 deletionsarch/ia64/include/asm/pgtable.h
- arch/ia64/include/asm/processor.h 3 additions, 3 deletionsarch/ia64/include/asm/processor.h
- arch/ia64/kernel/acpi.c 15 additions, 18 deletionsarch/ia64/kernel/acpi.c
- arch/ia64/kernel/head.S 2 additions, 2 deletionsarch/ia64/kernel/head.S
- arch/ia64/kernel/ia64_ksyms.c 1 addition, 1 deletionarch/ia64/kernel/ia64_ksyms.c
- arch/ia64/kernel/mca_asm.S 1 addition, 1 deletionarch/ia64/kernel/mca_asm.S
- arch/ia64/kernel/relocate_kernel.S 1 addition, 1 deletionarch/ia64/kernel/relocate_kernel.S
- arch/ia64/kernel/setup.c 7 additions, 20 deletionsarch/ia64/kernel/setup.c
- arch/ia64/kernel/vmlinux.lds.S 6 additions, 5 deletionsarch/ia64/kernel/vmlinux.lds.S
- arch/ia64/mm/contig.c 80 additions, 19 deletionsarch/ia64/mm/contig.c
- arch/ia64/mm/discontig.c 114 additions, 15 deletionsarch/ia64/mm/discontig.c
- arch/ia64/mm/init.c 2 additions, 2 deletionsarch/ia64/mm/init.c
- arch/ia64/sn/kernel/sn2/sn2_smp.c 4 additions, 4 deletionsarch/ia64/sn/kernel/sn2/sn2_smp.c
- arch/ia64/xen/irq_xen.c 67 additions, 64 deletionsarch/ia64/xen/irq_xen.c
- arch/ia64/xen/time.c 11 additions, 11 deletionsarch/ia64/xen/time.c
- arch/m68k/include/asm/pgtable_mm.h 2 additions, 2 deletionsarch/m68k/include/asm/pgtable_mm.h
- arch/m68k/sun3/mmu_emu.c 4 additions, 4 deletionsarch/m68k/sun3/mmu_emu.c
- arch/mn10300/kernel/kprobes.c 30 additions, 31 deletionsarch/mn10300/kernel/kprobes.c
Loading
Please register or sign in to comment