5 files changed, 0 insertions, 102 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 6c70fed0f9a0..e4b38861ea52 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -53,9 +53,6 @@ config STACKTRACE_SUPPORT
 config HAVE_LATENCYTOP_SUPPORT
        def_bool y
-config SEMAPHORE_SLEEPERS
-        def_bool y
 config FAST_CMPXCHG_LOCAL
        bool
        default y
diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
index 061627806a2d..deb43785e923 100644
--- a/arch/x86/kernel/i386_ksyms_32.c
+++ b/arch/x86/kernel/i386_ksyms_32.c
@@ -1,13 +1,8 @@
 #include <linux/module.h>
-#include <asm/semaphore.h>
 #include <asm/checksum.h>
 #include <asm/desc.h>
 #include <asm/pgtable.h>
-EXPORT_SYMBOL(__down_failed);
-EXPORT_SYMBOL(__down_failed_interruptible);
-EXPORT_SYMBOL(__down_failed_trylock);
-EXPORT_SYMBOL(__up_wakeup);
 /* Networking helper routines. */
 EXPORT_SYMBOL(csum_partial_copy_generic);
diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
index a66e9c1a0537..95a993e18165 100644
--- a/arch/x86/kernel/x8664_ksyms_64.c
+++ b/arch/x86/kernel/x8664_ksyms_64.c
@@ -4,7 +4,6 @@
 #include <linux/module.h>
 #include <linux/smp.h>
-#include <asm/semaphore.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
@@ -12,11 +11,6 @@
 EXPORT_SYMBOL(kernel_thread);
-EXPORT_SYMBOL(__down_failed);
-EXPORT_SYMBOL(__down_failed_interruptible);
-EXPORT_SYMBOL(__down_failed_trylock);
-EXPORT_SYMBOL(__up_wakeup);
 EXPORT_SYMBOL(__get_user_1);
 EXPORT_SYMBOL(__get_user_2);
 EXPORT_SYMBOL(__get_user_4);
diff --git a/arch/x86/lib/semaphore_32.S b/arch/x86/lib/semaphore_32.S
index 3899bd37fdf0..648fe4741782 100644
--- a/arch/x86/lib/semaphore_32.S
+++ b/arch/x86/lib/semaphore_32.S
@@ -30,89 +30,6 @@
 * value or just clobbered..
 */
        .section .sched.text, "ax"
-ENTRY(__down_failed)
-        CFI_STARTPROC
-        FRAME
-        pushl %edx
-        CFI_ADJUST_CFA_OFFSET 4
-        CFI_REL_OFFSET edx,0
-        pushl %ecx
-        CFI_ADJUST_CFA_OFFSET 4
-        CFI_REL_OFFSET ecx,0
-        call __down
-        popl %ecx
-        CFI_ADJUST_CFA_OFFSET -4
-        CFI_RESTORE ecx
-        popl %edx
-        CFI_ADJUST_CFA_OFFSET -4
-        CFI_RESTORE edx
-        ENDFRAME
-        ret
-        CFI_ENDPROC
-        ENDPROC(__down_failed)
-ENTRY(__down_failed_interruptible)
-        CFI_STARTPROC
-        FRAME
-        pushl %edx
-        CFI_ADJUST_CFA_OFFSET 4
-        CFI_REL_OFFSET edx,0
-        pushl %ecx
-        CFI_ADJUST_CFA_OFFSET 4
-        CFI_REL_OFFSET ecx,0
-        call __down_interruptible
-        popl %ecx
-        CFI_ADJUST_CFA_OFFSET -4
-        CFI_RESTORE ecx
-        popl %edx
-        CFI_ADJUST_CFA_OFFSET -4
-        CFI_RESTORE edx
-        ENDFRAME
-        ret
-        CFI_ENDPROC
-        ENDPROC(__down_failed_interruptible)
-ENTRY(__down_failed_trylock)
-        CFI_STARTPROC
-        FRAME
-        pushl %edx
-        CFI_ADJUST_CFA_OFFSET 4
-        CFI_REL_OFFSET edx,0
-        pushl %ecx
-        CFI_ADJUST_CFA_OFFSET 4
-        CFI_REL_OFFSET ecx,0
-        call __down_trylock
-        popl %ecx
-        CFI_ADJUST_CFA_OFFSET -4
-        CFI_RESTORE ecx
-        popl %edx
-        CFI_ADJUST_CFA_OFFSET -4
-        CFI_RESTORE edx
-        ENDFRAME
-        ret
-        CFI_ENDPROC
-        ENDPROC(__down_failed_trylock)
-ENTRY(__up_wakeup)
-        CFI_STARTPROC
-        FRAME
-        pushl %edx
-        CFI_ADJUST_CFA_OFFSET 4
-        CFI_REL_OFFSET edx,0
-        pushl %ecx
-        CFI_ADJUST_CFA_OFFSET 4
-        CFI_REL_OFFSET ecx,0
-        call __up
-        popl %ecx
-        CFI_ADJUST_CFA_OFFSET -4
-        CFI_RESTORE ecx
-        popl %edx
-        CFI_ADJUST_CFA_OFFSET -4
-        CFI_RESTORE edx
-        ENDFRAME
-        ret
-        CFI_ENDPROC
-        ENDPROC(__up_wakeup)
 /*
 * rw spinlock fallbacks
diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
index 8b92d428ab02..e009251d4e9f 100644
--- a/arch/x86/lib/thunk_64.S
+++ b/arch/x86/lib/thunk_64.S
@@ -41,11 +41,6 @@
        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

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 6c70fed0f9a0..e4b38861ea52 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig
@@ -53,9 +53,6 @@ config STACKTRACE_SUPPORT
53	config HAVE_LATENCYTOP_SUPPORT	53	config HAVE_LATENCYTOP_SUPPORT
54	def_bool y	54	def_bool y
55		55
56	config SEMAPHORE_SLEEPERS
57	def_bool y
58
59	config FAST_CMPXCHG_LOCAL	56	config FAST_CMPXCHG_LOCAL
60	bool	57	bool
61	default y	58	default y


diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c index 061627806a2d..deb43785e923 100644 --- a/arch/x86/kernel/i386_ksyms_32.c +++ b/arch/x86/kernel/i386_ksyms_32.c
@@ -1,13 +1,8 @@
1	#include <linux/module.h>	1	#include <linux/module.h>
2	#include <asm/semaphore.h>
3	#include <asm/checksum.h>	2	#include <asm/checksum.h>
4	#include <asm/desc.h>	3	#include <asm/desc.h>
5	#include <asm/pgtable.h>	4	#include <asm/pgtable.h>
6		5
7	EXPORT_SYMBOL(__down_failed);
8	EXPORT_SYMBOL(__down_failed_interruptible);
9	EXPORT_SYMBOL(__down_failed_trylock);
10	EXPORT_SYMBOL(__up_wakeup);
11	/* Networking helper routines. */	6	/* Networking helper routines. */
12	EXPORT_SYMBOL(csum_partial_copy_generic);	7	EXPORT_SYMBOL(csum_partial_copy_generic);
13		8


diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c index a66e9c1a0537..95a993e18165 100644 --- a/arch/x86/kernel/x8664_ksyms_64.c +++ b/arch/x86/kernel/x8664_ksyms_64.c
@@ -4,7 +4,6 @@
4	#include <linux/module.h>	4	#include <linux/module.h>
5	#include <linux/smp.h>	5	#include <linux/smp.h>
6		6
7	#include <asm/semaphore.h>
8	#include <asm/processor.h>	7	#include <asm/processor.h>
9	#include <asm/uaccess.h>	8	#include <asm/uaccess.h>
10	#include <asm/pgtable.h>	9	#include <asm/pgtable.h>
@@ -12,11 +11,6 @@
12		11
13	EXPORT_SYMBOL(kernel_thread);	12	EXPORT_SYMBOL(kernel_thread);
14		13
15	EXPORT_SYMBOL(__down_failed);
16	EXPORT_SYMBOL(__down_failed_interruptible);
17	EXPORT_SYMBOL(__down_failed_trylock);
18	EXPORT_SYMBOL(__up_wakeup);
19
20	EXPORT_SYMBOL(__get_user_1);	14	EXPORT_SYMBOL(__get_user_1);
21	EXPORT_SYMBOL(__get_user_2);	15	EXPORT_SYMBOL(__get_user_2);
22	EXPORT_SYMBOL(__get_user_4);	16	EXPORT_SYMBOL(__get_user_4);


diff --git a/arch/x86/lib/semaphore_32.S b/arch/x86/lib/semaphore_32.S index 3899bd37fdf0..648fe4741782 100644 --- a/arch/x86/lib/semaphore_32.S +++ b/arch/x86/lib/semaphore_32.S
@@ -30,89 +30,6 @@
30	* value or just clobbered..	30	* value or just clobbered..
31	*/	31	*/
32	.section .sched.text, "ax"	32	.section .sched.text, "ax"
33	ENTRY(__down_failed)
34	CFI_STARTPROC
35	FRAME
36	pushl %edx
37	CFI_ADJUST_CFA_OFFSET 4
38	CFI_REL_OFFSET edx,0
39	pushl %ecx
40	CFI_ADJUST_CFA_OFFSET 4
41	CFI_REL_OFFSET ecx,0
42	call __down
43	popl %ecx
44	CFI_ADJUST_CFA_OFFSET -4
45	CFI_RESTORE ecx
46	popl %edx
47	CFI_ADJUST_CFA_OFFSET -4
48	CFI_RESTORE edx
49	ENDFRAME
50	ret
51	CFI_ENDPROC
52	ENDPROC(__down_failed)
53
54	ENTRY(__down_failed_interruptible)
55	CFI_STARTPROC
56	FRAME
57	pushl %edx
58	CFI_ADJUST_CFA_OFFSET 4
59	CFI_REL_OFFSET edx,0
60	pushl %ecx
61	CFI_ADJUST_CFA_OFFSET 4
62	CFI_REL_OFFSET ecx,0
63	call __down_interruptible
64	popl %ecx
65	CFI_ADJUST_CFA_OFFSET -4
66	CFI_RESTORE ecx
67	popl %edx
68	CFI_ADJUST_CFA_OFFSET -4
69	CFI_RESTORE edx
70	ENDFRAME
71	ret
72	CFI_ENDPROC
73	ENDPROC(__down_failed_interruptible)
74
75	ENTRY(__down_failed_trylock)
76	CFI_STARTPROC
77	FRAME
78	pushl %edx
79	CFI_ADJUST_CFA_OFFSET 4
80	CFI_REL_OFFSET edx,0
81	pushl %ecx
82	CFI_ADJUST_CFA_OFFSET 4
83	CFI_REL_OFFSET ecx,0
84	call __down_trylock
85	popl %ecx
86	CFI_ADJUST_CFA_OFFSET -4
87	CFI_RESTORE ecx
88	popl %edx
89	CFI_ADJUST_CFA_OFFSET -4
90	CFI_RESTORE edx
91	ENDFRAME
92	ret
93	CFI_ENDPROC
94	ENDPROC(__down_failed_trylock)
95
96	ENTRY(__up_wakeup)
97	CFI_STARTPROC
98	FRAME
99	pushl %edx
100	CFI_ADJUST_CFA_OFFSET 4
101	CFI_REL_OFFSET edx,0
102	pushl %ecx
103	CFI_ADJUST_CFA_OFFSET 4
104	CFI_REL_OFFSET ecx,0
105	call __up
106	popl %ecx
107	CFI_ADJUST_CFA_OFFSET -4
108	CFI_RESTORE ecx
109	popl %edx
110	CFI_ADJUST_CFA_OFFSET -4
111	CFI_RESTORE edx
112	ENDFRAME
113	ret
114	CFI_ENDPROC
115	ENDPROC(__up_wakeup)
116		33
117	/*	34	/*
118	* rw spinlock fallbacks	35	* rw spinlock fallbacks


diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S index 8b92d428ab02..e009251d4e9f 100644 --- a/arch/x86/lib/thunk_64.S +++ b/arch/x86/lib/thunk_64.S
@@ -41,11 +41,6 @@
41	thunk rwsem_downgrade_thunk,rwsem_downgrade_wake	41	thunk rwsem_downgrade_thunk,rwsem_downgrade_wake
42	#endif	42	#endif
43		43
44	thunk __down_failed,__down
45	thunk_retrax __down_failed_interruptible,__down_interruptible
46	thunk_retrax __down_failed_trylock,__down_trylock
47	thunk __up_wakeup,__up
48
49	#ifdef CONFIG_TRACE_IRQFLAGS	44	#ifdef CONFIG_TRACE_IRQFLAGS
50	thunk trace_hardirqs_on_thunk,trace_hardirqs_on	45	thunk trace_hardirqs_on_thunk,trace_hardirqs_on
51	thunk trace_hardirqs_off_thunk,trace_hardirqs_off	46	thunk trace_hardirqs_off_thunk,trace_hardirqs_off