Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit b9d078ca4432b59f167e9c7824d8248353ede275

Authored by Richard Weinberger
Committed by Greg Kroah-Hartman
1 parent dcd295f7be

um: Skip futex_atomic_cmpxchg_inatomic() test 

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 1 additions and 0 deletions Inline Diff

arch/um/Kconfig.common
Diff comments   View file @ b9d078c
1 config UML 1 config UML
2 bool 2 bool
3 default y 3 default y
4 select HAVE_ARCH_AUDITSYSCALL 4 select HAVE_ARCH_AUDITSYSCALL
5 select HAVE_UID16 5 select HAVE_UID16
6 select HAVE_FUTEX_CMPXCHG if FUTEX
6 select GENERIC_IRQ_SHOW 7 select GENERIC_IRQ_SHOW
7 select GENERIC_CPU_DEVICES 8 select GENERIC_CPU_DEVICES
8 select GENERIC_IO 9 select GENERIC_IO
9 select GENERIC_CLOCKEVENTS 10 select GENERIC_CLOCKEVENTS
10 select TTY # Needed for line.c 11 select TTY # Needed for line.c
11 12
12 config MMU 13 config MMU
13 bool 14 bool
14 default y 15 default y
15 16
16 config NO_IOMEM 17 config NO_IOMEM
17 def_bool y 18 def_bool y
18 19
19 config ISA 20 config ISA
20 bool 21 bool
21 22
22 config SBUS 23 config SBUS
23 bool 24 bool
24 25
25 config PCI 26 config PCI
26 bool 27 bool
27 28
28 config PCMCIA 29 config PCMCIA
29 bool 30 bool
30 31
31 # Yet to do! 32 # Yet to do!
32 config TRACE_IRQFLAGS_SUPPORT 33 config TRACE_IRQFLAGS_SUPPORT
33 bool 34 bool
34 default n 35 default n
35 36
36 config LOCKDEP_SUPPORT 37 config LOCKDEP_SUPPORT
37 bool 38 bool
38 default y 39 default y
39 40
40 config STACKTRACE_SUPPORT 41 config STACKTRACE_SUPPORT
41 bool 42 bool
42 default y 43 default y
43 select STACKTRACE 44 select STACKTRACE
44 45
45 config GENERIC_CALIBRATE_DELAY 46 config GENERIC_CALIBRATE_DELAY
46 bool 47 bool
47 default y 48 default y
48 49
49 config GENERIC_BUG 50 config GENERIC_BUG
50 bool 51 bool
51 default y 52 default y
52 depends on BUG 53 depends on BUG
53 54
54 config HZ 55 config HZ
55 int 56 int
56 default 100 57 default 100
57 58
58 config SUBARCH 59 config SUBARCH
59 string 60 string
60 option env="SUBARCH" 61 option env="SUBARCH"
61 62