Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

kernel/up.c: omit it if SMP=y, USE_GENERIC_SMP_HELPERS=n

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>

authored by

Andrew Morton and committed by
Linus Torvalds
9316fcac 18e6959c

+2 -3
+2 -3
kernel/Makefile
··· 40 40 obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o 41 41 obj-$(CONFIG_RT_MUTEX_TESTER) += rtmutex-tester.o 42 42 obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o 43 - ifeq ($(CONFIG_USE_GENERIC_SMP_HELPERS),y) 44 - obj-y += smp.o 45 - else 43 + obj-$(CONFIG_USE_GENERIC_SMP_HELPERS) += smp.o 44 + ifneq ($(CONFIG_SMP),y) 46 45 obj-y += up.o 47 46 endif 48 47 obj-$(CONFIG_SMP) += spinlock.o