| From 116ead8990d193b47c1597037feab7b6b4346bba Mon Sep 17 00:00:00 2001 |
| From: Richard Weinberger <richard@nod.at> |
| Date: Mon, 23 May 2011 22:51:33 +0200 |
| Subject: [PATCH 2/3] um: Use RWSEM_GENERIC_SPINLOCK on x86 |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit 3a3679078aed2c451ebc32836bbd3b8219a65e01 upstream. |
| |
| Commit d12337 (rwsem: Remove redundant asmregparm annotation) |
| broke rwsem on UML. |
| |
| As we cannot compile UML with -mregparm=3 and keeping asmregparm only |
| for UML is inadequate the easiest solution is using RWSEM_GENERIC_SPINLOCK. |
| |
| Thanks to Thomas Gleixner for the idea. |
| |
| Reported-by: Toralf Förster <toralf.foerster@gmx.de> |
| Tested-by: Toralf Förster <toralf.foerster@gmx.de> |
| Signed-off-by: Richard Weinberger <richard@nod.at> |
| Cc: user-mode-linux-devel@lists.sourceforge.net |
| Link: http://lkml.kernel.org/r/%3C1306183893-26655-1-git-send-email-richard%40nod.at%3E |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| arch/um/Kconfig.x86 | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/um/Kconfig.x86 b/arch/um/Kconfig.x86 |
| index 5ee3280..91668e1 100644 |
| --- a/arch/um/Kconfig.x86 |
| +++ b/arch/um/Kconfig.x86 |
| @@ -20,10 +20,10 @@ config X86_32 |
| select HAVE_AOUT |
| |
| config RWSEM_XCHGADD_ALGORITHM |
| - def_bool X86_XADD |
| + def_bool X86_XADD && 64BIT |
| |
| config RWSEM_GENERIC_SPINLOCK |
| - def_bool !X86_XADD |
| + def_bool !RWSEM_XCHGADD_ALGORITHM |
| |
| config 3_LEVEL_PGTABLES |
| bool "Three-level pagetables (EXPERIMENTAL)" if !64BIT |
| -- |
| 1.7.12.1 |
| |
