-
- Downloads
Merge branch 'percpu-cpumask-x86-for-linus-2' of...
Merge branch 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (682 commits) percpu: fix spurious alignment WARN in legacy SMP percpu allocator percpu: generalize embedding first chunk setup helper percpu: more flexibility for @dyn_size of pcpu_setup_first_chunk() percpu: make x86 addr <-> pcpu ptr conversion macros generic linker script: define __per_cpu_load on all SMP capable archs x86: UV: remove uv_flush_tlb_others() WARN_ON percpu: finer grained locking to break deadlock and allow atomic free percpu: move fully free chunk reclamation into a work percpu: move chunk area map extension out of area allocation percpu: replace pcpu_realloc() with pcpu_mem_alloc() and pcpu_mem_free() x86, percpu: setup reserved percpu area for x86_64 percpu, module: implement reserved allocation and use it for module percpu variables percpu: add an indirection ptr for chunk page map access x86: make embedding percpu allocator return excessive free space percpu: use negative for auto for pcpu_setup_first_chunk() arguments percpu: improve first chunk initial area map handling percpu: cosmetic renames in pcpu_setup_first_chunk() percpu: clean up percpu constants x86: un-__init fill_pud/pmd/pte x86: remove vestigial fix_ioremap prototypes ... Manually merge conflicts in arch/ia64/kernel/irq_ia64.c
Showing
- Documentation/cputopology.txt 3 additions, 3 deletionsDocumentation/cputopology.txt
- Documentation/kernel-parameters.txt 6 additions, 1 deletionDocumentation/kernel-parameters.txt
- Documentation/x86/boot.txt 11 additions, 7 deletionsDocumentation/x86/boot.txt
- Makefile 2 additions, 1 deletionMakefile
- arch/alpha/kernel/irq.c 1 addition, 1 deletionarch/alpha/kernel/irq.c
- arch/alpha/mm/init.c 13 additions, 7 deletionsarch/alpha/mm/init.c
- arch/arm/kernel/irq.c 12 additions, 6 deletionsarch/arm/kernel/irq.c
- arch/arm/kernel/vmlinux.lds.S 2 additions, 0 deletionsarch/arm/kernel/vmlinux.lds.S
- arch/arm/oprofile/op_model_mpcore.c 1 addition, 1 deletionarch/arm/oprofile/op_model_mpcore.c
- arch/avr32/Kconfig 1 addition, 1 deletionarch/avr32/Kconfig
- arch/blackfin/include/asm/percpu.h 0 additions, 10 deletionsarch/blackfin/include/asm/percpu.h
- arch/blackfin/kernel/irqchip.c 5 additions, 0 deletionsarch/blackfin/kernel/irqchip.c
- arch/ia64/include/asm/percpu.h 2 additions, 2 deletionsarch/ia64/include/asm/percpu.h
- arch/ia64/include/asm/topology.h 1 addition, 1 deletionarch/ia64/include/asm/topology.h
- arch/ia64/include/asm/uv/uv.h 13 additions, 0 deletionsarch/ia64/include/asm/uv/uv.h
- arch/ia64/kernel/acpi.c 4 additions, 0 deletionsarch/ia64/kernel/acpi.c
- arch/ia64/kernel/iosapic.c 1 addition, 1 deletionarch/ia64/kernel/iosapic.c
- arch/ia64/kernel/irq.c 2 additions, 2 deletionsarch/ia64/kernel/irq.c
- arch/ia64/kernel/irq_ia64.c 6 additions, 8 deletionsarch/ia64/kernel/irq_ia64.c
- arch/ia64/kernel/msi_ia64.c 2 additions, 2 deletionsarch/ia64/kernel/msi_ia64.c
Loading
Please register or sign in to comment