From a17f36053f6dcaa99c61e58642a08698c6d6809e Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Thu, 5 Oct 2006 18:47:22 +0200 Subject: [PATCH] --- yaml --- r: 39023 b: refs/heads/master c: 88271e9e43e65537c6390af3718a60c45c787e8f h: refs/heads/master i: 39021: 4e50aa871fb5eaf156ca2437753e8c28ab854fcd 39019: 0eb4fd0191e46201e7a55a8260ea2d3d66f8c3b8 39015: 9ba6926c436f03dca1dd813c1e7ae0d53ea8a9f3 39007: 3eaee1d88beb28254a69013bb16ca245bbe032c9 v: v3 --- [refs] | 2 +- trunk/arch/i386/lib/semaphore.S | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b79e21adf36b..3f1785bd194c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d0b0e8ddbdda58a852ccff010c0339a38552cc7 +refs/heads/master: 88271e9e43e65537c6390af3718a60c45c787e8f diff --git a/trunk/arch/i386/lib/semaphore.S b/trunk/arch/i386/lib/semaphore.S index ef6ad9e1a609..c01eb39c0b43 100644 --- a/trunk/arch/i386/lib/semaphore.S +++ b/trunk/arch/i386/lib/semaphore.S @@ -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