diff options
| author | Ingo Molnar <mingo@elte.hu> | 2006-10-05 12:47:22 -0400 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-10-05 12:47:22 -0400 |
| commit | 88271e9e43e65537c6390af3718a60c45c787e8f (patch) | |
| tree | b5c84887d1de93bb9366181f07033e74bda10319 /arch/i386/lib/semaphore.S | |
| parent | 7d0b0e8ddbdda58a852ccff010c0339a38552cc7 (diff) | |
[PATCH] i386: fix rwsem build bug on CONFIG_M386=y
CONFIG_M386 turns on spinlock-based generic rwsems - which surprises the
semaphore.S rwsem stubs. Tested both with and without CONFIG_M386.
Reported-by: Klaus Knopper <knopper@knopper.net>
Triaged-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/i386/lib/semaphore.S')
| -rw-r--r-- | arch/i386/lib/semaphore.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/i386/lib/semaphore.S b/arch/i386/lib/semaphore.S index ef6ad9e1a609..c01eb39c0b43 100644 --- a/arch/i386/lib/semaphore.S +++ b/arch/i386/lib/semaphore.S | |||
| @@ -152,6 +152,8 @@ ENTRY(__read_lock_failed) | |||
| 152 | 152 | ||
| 153 | #endif | 153 | #endif |
| 154 | 154 | ||
| 155 | #ifdef CONFIG_RWSEM_XCHGADD_ALGORITHM | ||
| 156 | |||
| 155 | /* Fix up special calling conventions */ | 157 | /* Fix up special calling conventions */ |
| 156 | ENTRY(call_rwsem_down_read_failed) | 158 | ENTRY(call_rwsem_down_read_failed) |
| 157 | CFI_STARTPROC | 159 | CFI_STARTPROC |
| @@ -214,3 +216,4 @@ ENTRY(call_rwsem_downgrade_wake) | |||
| 214 | CFI_ENDPROC | 216 | CFI_ENDPROC |
| 215 | END(call_rwsem_downgrade_wake) | 217 | END(call_rwsem_downgrade_wake) |
| 216 | 218 | ||
| 219 | #endif | ||