diff options
| author | Jan Beulich <JBeulich@novell.com> | 2011-07-19 07:59:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-21 03:03:31 -0400 |
| commit | 4625cd637919edfb562e0d62abf94f52e9321335 (patch) | |
| tree | 88c4cf965722fb54731a6e8f632ec6ef6e83e194 /arch/x86/lib/Makefile | |
| parent | dd2897bf0f4d523238e87dabb23e9634ea9ba73d (diff) | |
x86: Unify rwlock assembly implementation
Rather than having two functionally identical implementations
for 32- and 64-bit configurations, extend the existing assembly
abstractions enough to fold the two rwlock implementations into
a shared one.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/4E258DD7020000780004E3EA@nat28.tlf.novell.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/lib/Makefile')
| -rw-r--r-- | arch/x86/lib/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index f2479f19ddde..d3ed1203cdd7 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile | |||
| @@ -20,6 +20,7 @@ lib-y := delay.o | |||
| 20 | lib-y += thunk_$(BITS).o | 20 | lib-y += thunk_$(BITS).o |
| 21 | lib-y += usercopy_$(BITS).o getuser.o putuser.o | 21 | lib-y += usercopy_$(BITS).o getuser.o putuser.o |
| 22 | lib-y += memcpy_$(BITS).o | 22 | lib-y += memcpy_$(BITS).o |
| 23 | lib-$(CONFIG_SMP) += rwlock.o | ||
| 23 | lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o | 24 | lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o |
| 24 | 25 | ||
| 25 | obj-y += msr.o msr-reg.o msr-reg-export.o | 26 | obj-y += msr.o msr-reg.o msr-reg-export.o |
| @@ -29,7 +30,8 @@ ifeq ($(CONFIG_X86_32),y) | |||
| 29 | lib-y += atomic64_cx8_32.o | 30 | lib-y += atomic64_cx8_32.o |
| 30 | lib-y += checksum_32.o | 31 | lib-y += checksum_32.o |
| 31 | lib-y += strstr_32.o | 32 | lib-y += strstr_32.o |
| 32 | lib-y += semaphore_32.o string_32.o | 33 | lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += semaphore_32.o |
| 34 | lib-y += string_32.o | ||
| 33 | lib-y += cmpxchg.o | 35 | lib-y += cmpxchg.o |
| 34 | ifneq ($(CONFIG_X86_CMPXCHG64),y) | 36 | ifneq ($(CONFIG_X86_CMPXCHG64),y) |
| 35 | lib-y += cmpxchg8b_emu.o atomic64_386_32.o | 37 | lib-y += cmpxchg8b_emu.o atomic64_386_32.o |
| @@ -40,7 +42,7 @@ else | |||
| 40 | lib-y += csum-partial_64.o csum-copy_64.o csum-wrappers_64.o | 42 | lib-y += csum-partial_64.o csum-copy_64.o csum-wrappers_64.o |
| 41 | lib-y += thunk_64.o clear_page_64.o copy_page_64.o | 43 | lib-y += thunk_64.o clear_page_64.o copy_page_64.o |
| 42 | lib-y += memmove_64.o memset_64.o | 44 | lib-y += memmove_64.o memset_64.o |
| 43 | lib-y += copy_user_64.o rwlock_64.o copy_user_nocache_64.o | 45 | lib-y += copy_user_64.o copy_user_nocache_64.o |
| 44 | lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem_64.o | 46 | lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem_64.o |
| 45 | lib-y += cmpxchg16b_emu.o | 47 | lib-y += cmpxchg16b_emu.o |
| 46 | endif | 48 | endif |