core kernel fixes
Linus,
Please pull the latest core-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-fixes-for-linus
Thanks,
Ingo
------------------>
Andrew Morton (1):
smp_call_function_single(): be slightly less stupid
David Miller (1):
sparc64: Fix cpumask related build failure
Ingo Molnar (1):
smp_call_function_single(): be slightly less stupid, fix
Paul E. McKenney (1):
rcu: fix bug in rcutorture system-shutdown code
arch/sparc/include/asm/topology_64.h | 4 + include/linux/smp.h | 13 +--- kernel/Makefile | 6 ++- kernel/rcutorture.c | 113 ++++++++++++++++++++------------- kernel/up.c | 20 ++++++ 5 files changed, 100 insertions(+), 56 deletions(-) create mode 100644 kernel/up.c
arch/sparc/include/asm/topology_64.h +4 -0
@@ -47,6 +47,10 @@ static inline int pcibus_to_node(struct pci_bus *pbus) (pcibus_to_node (bus) ==-1 ? \CPU_MASK_ALL : \ node_to_cpumask(pcibus_to_node(bus))) +#define cpumask_of_pcibus (bus) \ + (pcibus_to_node(bus) == -1 ? \ + CPU_MASK_ALL_PTR : \ + cpumask_of_node(pcibus_to_node(bus)))#define SD_NODE_INIT (struct sched_domain) { \ .min_interval = 8, \
include/linux/smp.h +3 -10
@@ -24,6 +24,9 @@ struct call_single_data {/* total number of cpus in this system (may exceed NR_CPUS) */ extern unsigned int total_cpus; +int smp_call_function_single (int cpuid,void (*func) (void *info),void *info, +int wait); +#ifdef CONFIG_SMP #include <linux/preempt.h>
@@ -79,8 +82,6 @@ smp_call_function_mask(cpumask_t mask, void(*func)(void *info), void *info,return 0 ; } -int smp_call_function_single (int cpuid,void (*func) (void *info),void *info, -int wait);void __smp_call_function_single (int cpuid,struct call_single_data *data);/*
@@ -140,14 +141,6 @@ static inline int up_smp_call_function(void (*func)(void *), void *info)static inline void smp_send_reschedule (int cpu) { }#define num_booting_cpus () 1#define smp_prepare_boot_cpu () do {} while (0) -#define smp_call_function_single (cpuid, func, info, wait) \ -({ \ - WARN_ON(cpuid != 0); \ - local_irq_disable(); \ - (func)(info); \ - local_irq_enable(); \ - 0; \ -})#define smp_call_function_mask (mask, func, info, wait) \ (up_smp_call_function(func, info))#define smp_call_function_many (mask, func, info, wait) \
kernel/Makefile +5 -1
@@ -40,7 +40,11 @@ obj-$(CONFIG_RT_MUTEXES) += rtmutex.o obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o obj-$(CONFIG_RT_MUTEX_TESTER) += rtmutex-tester.o obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o -obj-$(CONFIG_USE_GENERIC_SMP_HELPERS) += smp.o +ifeq ($(CONFIG_USE_GENERIC_SMP_HELPERS),y) +obj-y += smp.o +else +obj-y += up.o +endif obj-$(CONFIG_SMP) += spinlock.o obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o obj-$(CONFIG_PROVE_LOCKING) += spinlock.o
kernel/rcutorture.c +68 -45
248 lines not on this page · raw message
kernel/up.c new file +20 -0
@@ -0,0 +1,20 @@ +/* +* Uniprocessor-only support functions. The counterpart to kernel/smp.c +*/ + +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/smp.h> + +int smp_call_function_single (int cpu,void (*func) (void *info),void *info, +int wait) +{ +WARN_ON (cpu !=0 ); + +local_irq_disable (); + (func)(info); +local_irq_enable (); + +return 0 ; +} +EXPORT_SYMBOL (smp_call_function_single);