diff options
| author | Ingo Molnar <mingo@elte.hu> | 2006-01-10 16:07:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 16:20:47 -0500 |
| commit | 73165b88ffd29813bf73b331eaf90d3521443236 (patch) | |
| tree | 224b510df182c5cba7b64fea6202ed9dd414835e /include | |
| parent | 042c904c3e35e95ac911e8a2bf4097099b059e1a (diff) | |
[PATCH] fix i386 mutex fastpath on FRAME_POINTER && !DEBUG_MUTEXES
Call the mutex slowpath more conservatively - e.g. FRAME_POINTERS can
change the calling convention, in which case a direct branch to the
slowpath becomes illegal. Bug found by Hugh Dickins.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/mutex.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/include/asm-i386/mutex.h b/include/asm-i386/mutex.h index 4e5e3de1b9a6..c657d4b09f0a 100644 --- a/include/asm-i386/mutex.h +++ b/include/asm-i386/mutex.h | |||
| @@ -28,7 +28,13 @@ do { \ | |||
| 28 | \ | 28 | \ |
| 29 | __asm__ __volatile__( \ | 29 | __asm__ __volatile__( \ |
| 30 | LOCK " decl (%%eax) \n" \ | 30 | LOCK " decl (%%eax) \n" \ |
| 31 | " js "#fail_fn" \n" \ | 31 | " js 2f \n" \ |
| 32 | "1: \n" \ | ||
| 33 | \ | ||
| 34 | LOCK_SECTION_START("") \ | ||
| 35 | "2: call "#fail_fn" \n" \ | ||
| 36 | " jmp 1b \n" \ | ||
| 37 | LOCK_SECTION_END \ | ||
| 32 | \ | 38 | \ |
| 33 | :"=a" (dummy) \ | 39 | :"=a" (dummy) \ |
| 34 | : "a" (count) \ | 40 | : "a" (count) \ |
| @@ -78,7 +84,13 @@ do { \ | |||
| 78 | \ | 84 | \ |
| 79 | __asm__ __volatile__( \ | 85 | __asm__ __volatile__( \ |
| 80 | LOCK " incl (%%eax) \n" \ | 86 | LOCK " incl (%%eax) \n" \ |
| 81 | " jle "#fail_fn" \n" \ | 87 | " jle 2f \n" \ |
| 88 | "1: \n" \ | ||
| 89 | \ | ||
| 90 | LOCK_SECTION_START("") \ | ||
| 91 | "2: call "#fail_fn" \n" \ | ||
| 92 | " jmp 1b \n" \ | ||
| 93 | LOCK_SECTION_END \ | ||
| 82 | \ | 94 | \ |
| 83 | :"=a" (dummy) \ | 95 | :"=a" (dummy) \ |
| 84 | : "a" (count) \ | 96 | : "a" (count) \ |