]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] i386: fix rwsem build bug on CONFIG_M386=y
authorIngo Molnar <mingo@elte.hu>
Thu, 5 Oct 2006 16:47:22 +0000 (18:47 +0200)
committerAndi Kleen <andi@basil.nowhere.org>
Thu, 5 Oct 2006 16:47:22 +0000 (18:47 +0200)
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>
arch/i386/lib/semaphore.S

index ef6ad9e1a609d85d751268b4c8911706476b723b..c01eb39c0b43160738fd0cba92fa9e9c38f1629d 100644 (file)
@@ -152,6 +152,8 @@ ENTRY(__read_lock_failed)
 
 #endif
 
+#ifdef CONFIG_RWSEM_XCHGADD_ALGORITHM
+
 /* Fix up special calling conventions */
 ENTRY(call_rwsem_down_read_failed)
        CFI_STARTPROC
@@ -214,3 +216,4 @@ ENTRY(call_rwsem_downgrade_wake)
        CFI_ENDPROC
        END(call_rwsem_downgrade_wake)
 
+#endif