aboutsummaryrefslogtreecommitdiffstats
path: root/main/musl/0009-fix-regression-disabling-use-of-pause-instruction-fo.patch
blob: 58b2459f89386b8dbe7ba64c3af10f12452159df (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
From 5c3412d22555d03a1c00578ba8faaa8dc9206420 Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Tue, 29 Mar 2016 21:22:52 -0400
Subject: [PATCH] fix regression disabling use of pause instruction for x86
 a_spin

commits e24984efd5c6ac5ea8e6cb6cd914fa8435d458bc and
16b55298dc4b6a54d287d7494e04542667ef8861 inadvertently disabled the
a_spin implementations for i386, x86_64, and x32 by defining a macro
named a_pause instead of a_spin. this should not have caused any
functional regression, but it inhibited cpu relaxation while spinning
for locks.

bug reported by George Kulakowski.
---
 arch/i386/atomic_arch.h   | 2 +-
 arch/x32/atomic_arch.h    | 2 +-
 arch/x86_64/atomic_arch.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/i386/atomic_arch.h b/arch/i386/atomic_arch.h
index 6e67c4c..2b1a049 100644
--- a/arch/i386/atomic_arch.h
+++ b/arch/i386/atomic_arch.h
@@ -71,7 +71,7 @@ static inline void a_barrier()
 	__asm__ __volatile__( "" : : : "memory" );
 }
 
-#define a_pause a_pause
+#define a_spin a_spin
 static inline void a_spin()
 {
 	__asm__ __volatile__( "pause" : : : "memory" );
diff --git a/arch/x32/atomic_arch.h b/arch/x32/atomic_arch.h
index 26098d3..7daf4ae 100644
--- a/arch/x32/atomic_arch.h
+++ b/arch/x32/atomic_arch.h
@@ -87,7 +87,7 @@ static inline void a_barrier()
 	__asm__ __volatile__( "" : : : "memory" );
 }
 
-#define a_pause a_pause
+#define a_spin a_spin
 static inline void a_spin()
 {
 	__asm__ __volatile__( "pause" : : : "memory" );
diff --git a/arch/x86_64/atomic_arch.h b/arch/x86_64/atomic_arch.h
index 9f47f80..55fc6fb 100644
--- a/arch/x86_64/atomic_arch.h
+++ b/arch/x86_64/atomic_arch.h
@@ -96,7 +96,7 @@ static inline void a_barrier()
 	__asm__ __volatile__( "" : : : "memory" );
 }
 
-#define a_pause a_pause
+#define a_spin a_spin
 static inline void a_spin()
 {
 	__asm__ __volatile__( "pause" : : : "memory" );
-- 
2.7.4