projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a750036
)
um: Make rwsem.S depend on CONFIG_RWSEM_XCHGADD_ALGORITHM
author
Richard Weinberger
<
[email protected]
>
Fri, 22 Jul 2011 18:55:34 +0000
(20:55 +0200)
committer
Ingo Molnar
<
[email protected]
>
Fri, 22 Jul 2011 21:06:30 +0000
(23:06 +0200)
rwsem.S can only be used with CONFIG_RWSEM_XCHGADD_ALGORITHM.
This unbreaks the UML build on i386.
Reported-by: Randy Dunlap <
[email protected]
>
Acked-by: Randy Dunlap <
[email protected]
>
Signed-off-by: Richard Weinberger <
[email protected]
>
Cc: Stephen Rothwell <
[email protected]
>
Cc:
[email protected]
Cc:
[email protected]
Link:
http://lkml.kernel.org/r/
[email protected]
Signed-off-by: Ingo Molnar <
[email protected]
>
arch/um/sys-i386/Makefile
patch
|
blob
|
history
diff --git
a/arch/um/sys-i386/Makefile
b/arch/um/sys-i386/Makefile
index 15587ed9a361d9fd3f967770b799d443291325d8..87b659dadf3fc7698c12726e238d0fa856d679bd 100644
(file)
--- 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