From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Jul 2011 00:02:24 +0000 (-0700)
Subject: Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: MMI-PSA29.97-13-9~18906
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eb47418dc56baaca33d270a868d8ddaa81150952;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'x86-asm-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix write lock scalability 64-bit issue
  x86: Unify rwsem assembly implementation
  x86: Unify rwlock assembly implementation
  x86, asm: Fix binutils 2.16 issue with __USER32_CS
  x86, asm: Cleanup thunk_64.S
  x86, asm: Flip RESTORE_ARGS arguments logic
  x86, asm: Flip SAVE_ARGS arguments logic
  x86, asm: Thin down SAVE/RESTORE_* asm macros
---

eb47418dc56baaca33d270a868d8ddaa81150952
diff --cc arch/x86/lib/Makefile
index 6ba477342b8e,5d46ddcb69c5..b00f6785da74
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@@ -18,8 -18,10 +18,10 @@@ obj-$(CONFIG_SMP) += msr-smp.o cache-sm
  
  lib-y := delay.o
  lib-y += thunk_$(BITS).o
 -lib-y += usercopy_$(BITS).o getuser.o putuser.o
 +lib-y += usercopy_$(BITS).o usercopy.o getuser.o putuser.o
  lib-y += memcpy_$(BITS).o
+ lib-$(CONFIG_SMP) += rwlock.o
+ lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o
  lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o
  
  obj-y += msr.o msr-reg.o msr-reg-export.o