[tip:x86/asm] um: Make rwsem.S depend on CONFIG_RWSEM_XCHGADD_ALGORITHM

From: tip-bot for Richard Weinberger
Date: Fri Jul 22 2011 - 17:40:35 EST

Commit-ID: a03fc8c375511b6ab43184ab191af3218a919646
Gitweb: http://git.kernel.org/tip/a03fc8c375511b6ab43184ab191af3218a919646
Author: Richard Weinberger <richard@xxxxxx>
AuthorDate: Fri, 22 Jul 2011 20:55:34 +0200
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Fri, 22 Jul 2011 23:06:30 +0200


rwsem.S can only be used with CONFIG_RWSEM_XCHGADD_ALGORITHM.
This unbreaks the UML build on i386.

Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Signed-off-by: Richard Weinberger <richard@xxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: user-mode-linux-devel@xxxxxxxxxxxxxxxxxxxxx
Cc: JBeulich@xxxxxxxxxx
Link: http://lkml.kernel.org/r/201107222055.35341.richard@xxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
arch/um/sys-i386/Makefile | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile
index 15587ed..87b659d 100644
--- a/arch/um/sys-i386/Makefile
+++ b/arch/um/sys-i386/Makefile
@@ -8,7 +8,8 @@ obj-y = bug.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \

obj-$(CONFIG_BINFMT_ELF) += elfcore.o

-subarch-obj-y = lib/rwsem.o lib/string_32.o
+subarch-obj-y = lib/string_32.o
+subarch-obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += lib/rwsem.o
subarch-obj-$(CONFIG_HIGHMEM) += mm/highmem_32.o
subarch-obj-$(CONFIG_MODULES) += kernel/module.o

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/