Messages in this thread Patch in this message | | | Date | Wed, 3 Apr 2019 14:47:51 +0200 | From | Peter Zijlstra <> | Subject | Re: [tip:locking/core] locking/rwsem: Remove arch specific rwsem files |
| |
On Wed, Apr 03, 2019 at 03:44:11AM -0700, tip-bot for Waiman Long wrote: > diff --git a/arch/x86/um/Makefile b/arch/x86/um/Makefile > index 2d686ae54681..22554c585ced 100644 > --- a/arch/x86/um/Makefile > +++ b/arch/x86/um/Makefile > @@ -21,7 +21,6 @@ obj-y += checksum_32.o syscalls_32.o > obj-$(CONFIG_ELF_CORE) += elfcore.o > > subarch-y = ../lib/string_32.o ../lib/atomic64_32.o ../lib/atomic64_cx8_32.o > -subarch-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += ../lib/rwsem.o > > else >
The x86_64 um build needs this on top:
diff --git a/arch/x86/um/Makefile b/arch/x86/um/Makefile index 22554c585ced..33c51c064c77 100644 --- a/arch/x86/um/Makefile +++ b/arch/x86/um/Makefile @@ -26,8 +26,7 @@ else obj-y += syscalls_64.o vdso/ -subarch-y = ../lib/csum-partial_64.o ../lib/memcpy_64.o ../entry/thunk_64.o \ - ../lib/rwsem.o +subarch-y = ../lib/csum-partial_64.o ../lib/memcpy_64.o ../entry/thunk_64.o endif
| |