Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', 'omap...

[~andy/linux] / arch / x86 / lib / thunk_64.S

diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
index 55e586d352d3c444d35fe7399726666ba94b9adf..e009251d4e9f3afa3874e2ab48bd2d6cd28a83ae 100644 (file)
--- a/arch/x86/lib/thunk_64.S
+++ b/arch/x86/lib/thunk_64.S
@@ -33,7 +33,7 @@
        .endm
        
 
-       .section .sched.text
+       .section .sched.text, "ax"
 #ifdef CONFIG_RWSEM_XCHGADD_ALGORITHM
        thunk rwsem_down_read_failed_thunk,rwsem_down_read_failed
        thunk rwsem_down_write_failed_thunk,rwsem_down_write_failed
@@ -41,15 +41,14 @@
        thunk rwsem_downgrade_thunk,rwsem_downgrade_wake
 #endif 
        
-       thunk __down_failed,__down
-       thunk_retrax __down_failed_interruptible,__down_interruptible
-       thunk_retrax __down_failed_trylock,__down_trylock
-       thunk __up_wakeup,__up
-
 #ifdef CONFIG_TRACE_IRQFLAGS
        thunk trace_hardirqs_on_thunk,trace_hardirqs_on
        thunk trace_hardirqs_off_thunk,trace_hardirqs_off
 #endif
+
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+       thunk lockdep_sys_exit_thunk,lockdep_sys_exit
+#endif
        
        /* SAVE_ARGS below is used only for the .cfi directives it contains. */
        CFI_STARTPROC