Merge branch 'generic-ipi-for-linus' of...
Merge branch 'generic-ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'generic-ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (22 commits) generic-ipi: more merge fallout generic-ipi: merge fix x86, visws: use mach-default/entry_arch.h x86, visws: fix generic-ipi build generic-ipi: fixlet generic-ipi: fix s390 build bug generic-ipi: fix linux-next tree build failure fix: "smp_call_function: get rid of the unused nonatomic/retry argument" fix: "smp_call_function: get rid of the unused nonatomic/retry argument" fix "smp_call_function: get rid of the unused nonatomic/retry argument" on_each_cpu(): kill unused 'retry' parameter smp_call_function: get rid of the unused nonatomic/retry argument sh: convert to generic helpers for IPI function calls parisc: convert to generic helpers for IPI function calls mips: convert to generic helpers for IPI function calls m32r: convert to generic helpers for IPI function calls arm: convert to generic helpers for IPI function calls alpha: convert to generic helpers for IPI function calls ia64: convert to generic helpers for IPI function calls powerpc: convert to generic helpers for IPI function calls ... Fix trivial conflicts due to rcu updates in kernel/rcupdate.c manually
Showing
- arch/Kconfig 3 additions, 0 deletionsarch/Kconfig
- arch/alpha/Kconfig 1 addition, 0 deletionsarch/alpha/Kconfig
- arch/alpha/kernel/core_marvel.c 3 additions, 3 deletionsarch/alpha/kernel/core_marvel.c
- arch/alpha/kernel/process.c 1 addition, 1 deletionarch/alpha/kernel/process.c
- arch/alpha/kernel/smp.c 15 additions, 165 deletionsarch/alpha/kernel/smp.c
- arch/alpha/oprofile/common.c 3 additions, 3 deletionsarch/alpha/oprofile/common.c
- arch/arm/Kconfig 1 addition, 0 deletionsarch/arm/Kconfig
- arch/arm/kernel/smp.c 18 additions, 145 deletionsarch/arm/kernel/smp.c
- arch/arm/oprofile/op_model_mpcore.c 1 addition, 1 deletionarch/arm/oprofile/op_model_mpcore.c
- arch/arm/vfp/vfpmodule.c 1 addition, 1 deletionarch/arm/vfp/vfpmodule.c
- arch/cris/arch-v32/kernel/smp.c 2 additions, 3 deletionsarch/cris/arch-v32/kernel/smp.c
- arch/ia64/Kconfig 1 addition, 0 deletionsarch/ia64/Kconfig
- arch/ia64/kernel/mca.c 3 additions, 3 deletionsarch/ia64/kernel/mca.c
- arch/ia64/kernel/palinfo.c 1 addition, 1 deletionarch/ia64/kernel/palinfo.c
- arch/ia64/kernel/perfmon.c 3 additions, 3 deletionsarch/ia64/kernel/perfmon.c
- arch/ia64/kernel/process.c 1 addition, 1 deletionarch/ia64/kernel/process.c
- arch/ia64/kernel/smp.c 15 additions, 239 deletionsarch/ia64/kernel/smp.c
- arch/ia64/kernel/smpboot.c 3 additions, 3 deletionsarch/ia64/kernel/smpboot.c
- arch/ia64/kernel/uncached.c 2 additions, 3 deletionsarch/ia64/kernel/uncached.c
- arch/ia64/sn/kernel/sn2/sn_hwperf.c 1 addition, 1 deletionarch/ia64/sn/kernel/sn2/sn_hwperf.c
Loading
Please register or sign in to comment