]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
um: Skip futex_atomic_cmpxchg_inatomic() test
authorRichard Weinberger <richard@nod.at>
Wed, 10 Dec 2014 12:53:51 +0000 (13:53 +0100)
committerJiri Slaby <jslaby@suse.cz>
Thu, 29 Jan 2015 14:44:47 +0000 (15:44 +0100)
commit f911d731054ab3d82ee72a16b889e17ca3a2332a upstream.

futex_atomic_cmpxchg_inatomic() does not work on UML because
it triggers a copy_from_user() in kernel context.
On UML copy_from_user() can only be used if the kernel was called
by a real user space process such that UML can use ptrace()
to fetch the value.

Reported-by: Miklos Szeredi <miklos@szeredi.hu>
Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Richard Weinberger <richard@nod.at>
Tested-by: Daniel Walter <d.walter@0x90.at>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
arch/um/Kconfig.common

index 8ddea1f8006a5a0732a3550ff6a5883aabd7fdec..0228a6ab9b186d960dc5a9d53f86689d43e49736 100644 (file)
@@ -7,6 +7,7 @@ config UML
        bool
        default y
        select HAVE_UID16
+       select HAVE_FUTEX_CMPXCHG if FUTEX
        select GENERIC_IRQ_SHOW
        select GENERIC_CPU_DEVICES
        select GENERIC_IO