]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
kernel/up.c: omit it if SMP=y, USE_GENERIC_SMP_HELPERS=n
authorAndrew Morton <akpm@linux-foundation.org>
Wed, 14 Jan 2009 17:35:44 +0000 (09:35 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Jan 2009 17:42:11 +0000 (09:42 -0800)
Fix the sparc build - we were including `up.o' on SMP builds, when
CONFIG_USE_GENERIC_SMP_HELPERS=n.

Tested-by: Robert Reif <reif@earthlink.net>
Fixed-by: Robert Reif <reif@earthlink.net>
Cc: David Miller <davem@davemloft.net>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
kernel/Makefile

index 2aebc4cd787810a5e71ca4ea4aa35301220a6355..170a9213c1b68d6cee652fb7758fef556ecf127f 100644 (file)
@@ -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
 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
 obj-y += up.o
 endif
 obj-$(CONFIG_SMP) += spinlock.o