diff options
| author | Richard Weinberger <richard@nod.at> | 2011-07-22 20:55:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-22 23:06:30 +0200 |
| commit | a03fc8c375511b6ab43184ab191af3218a919646 (patch) | |
| tree | 710e071746352654a7fefa74b987c9b194dbcc24 /arch/um | |
| parent | a750036f35cda160ef77408ec92c3dc41f8feebb (diff) | |
| download | linux-3.10-a03fc8c375511b6ab43184ab191af3218a919646.tar.gz linux-3.10-a03fc8c375511b6ab43184ab191af3218a919646.tar.bz2 linux-3.10-a03fc8c375511b6ab43184ab191af3218a919646.zip | |
um: Make rwsem.S depend on CONFIG_RWSEM_XCHGADD_ALGORITHM
rwsem.S can only be used with CONFIG_RWSEM_XCHGADD_ALGORITHM.
This unbreaks the UML build on i386.
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Richard Weinberger <richard@nod.at>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: user-mode-linux-devel@lists.sourceforge.net
Cc: JBeulich@novell.com
Link: http://lkml.kernel.org/r/201107222055.35341.richard@nod.at
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | 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 15587ed9a36..87b659dadf3 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 |