Messages in this thread Patch in this message | | | Date | Tue, 13 Jan 2009 23:59:40 -0800 | From | Andrew Morton <> | Subject | Re: sparc32 compile error: redefinition of ‘smp call function single’ |
| |
On Tue, 13 Jan 2009 22:38:01 -0500 Robert Reif <reif@earthlink.net> wrote:
> This worked: > > diff --git a/kernel/Makefile b/kernel/Makefile > index 2aebc4c..368227d 100644 > --- a/kernel/Makefile > +++ b/kernel/Makefile > @@ -43,8 +43,10 @@ obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o > ifeq ($(CONFIG_USE_GENERIC_SMP_HELPERS),y) > obj-y += smp.o > else > +ifneq ($(CONFIG_SMP),y) > obj-y += up.o > endif > +endif > obj-$(CONFIG_SMP) += spinlock.o > obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o > obj-$(CONFIG_PROVE_LOCKING) += spinlock.o
This all can be simplified, can't it?
obj-$(CONFIG_USE_GENERIC_SMP_HELPERS) += smp.o ifneq ($(CONFIG_SMP),y) obj-y += up.o endif
(someone please check my homework - I don't have a good track record here ;))
--- a/kernel/Makefile~kernel-upc-omit-it-if-smp=y-use_generic_smp_helpers=n +++ a/kernel/Makefile @@ -40,9 +40,8 @@ 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 -ifeq ($(CONFIG_USE_GENERIC_SMP_HELPERS),y) -obj-y += smp.o -else +obj-$(CONFIG_USE_GENERIC_SMP_HELPERS) += smp.o +ifneq ($(CONFIG_SMP),y) obj-y += up.o endif obj-$(CONFIG_SMP) += spinlock.o _
| |