Pull misc-for-upstream into release branch

[~andy/linux] / arch / x86_64 / lib / thunk.S

diff --git a/arch/x86_64/lib/thunk.S b/arch/x86_64/lib/thunk.S
index 332ea5dff9169627475dbc90f54b4ced9c36d179..55e586d352d3c444d35fe7399726666ba94b9adf 100644 (file)
--- a/arch/x86_64/lib/thunk.S
+++ b/arch/x86_64/lib/thunk.S
@@ -1,12 +1,10 @@
-       /*
-        * Save registers before calling assembly functions. This avoids
-        * disturbance of register allocation in some inline assembly constructs.
-        * Copyright 2001,2002 by Andi Kleen, SuSE Labs.
-        * Subject to the GNU public license, v.2. No warranty of any kind.
-        * $Id: thunk.S,v 1.2 2002/03/13 20:06:58 ak Exp $
-        */
+/*
+ * Save registers before calling assembly functions. This avoids
+ * disturbance of register allocation in some inline assembly constructs.
+ * Copyright 2001,2002 by Andi Kleen, SuSE Labs.
+ * Subject to the GNU public license, v.2. No warranty of any kind.
+ */
 
-       #include <linux/config.h>
        #include <linux/linkage.h>
        #include <asm/dwarf2.h>
        #include <asm/calling.h>                        
@@ -67,33 +65,3 @@ restore_norax:
        RESTORE_ARGS 1
        ret
        CFI_ENDPROC
-
-#ifdef CONFIG_SMP
-/* Support for read/write spinlocks. */
-       .text
-/* rax:        pointer to rwlock_t */  
-ENTRY(__write_lock_failed)
-       lock
-       addl $RW_LOCK_BIAS,(%rax)
-1:     rep
-       nop
-       cmpl $RW_LOCK_BIAS,(%rax)
-       jne 1b
-       lock 
-       subl $RW_LOCK_BIAS,(%rax)
-       jnz  __write_lock_failed
-       ret
-
-/* rax:        pointer to rwlock_t */  
-ENTRY(__read_lock_failed)
-       lock
-       incl (%rax)
-1:     rep
-       nop
-       cmpl $1,(%rax)
-       js 1b
-       lock
-       decl (%rax)
-       js __read_lock_failed
-       ret
-#endif