tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

Pull UML fixes from Richard Weinberger:
"Two fixes for UML regressions. Nothing exciting"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
x86, um: actually mark system call tables readonly
um: Skip futex_atomic_cmpxchg_inatomic() test

Linus Torvalds 693a30b8 4bf9636c

options
unified split
Changed files
+3 -2
arch
um
Kconfig.common
x86
um
sys_call_table_32.c
sys_call_table_64.c
+1
arch/um/Kconfig.common
··· 3 3 default y 4 4 select HAVE_ARCH_AUDITSYSCALL 5 5 select HAVE_UID16 6 + select HAVE_FUTEX_CMPXCHG if FUTEX 6 7 select GENERIC_IRQ_SHOW 7 8 select GENERIC_CPU_DEVICES 8 9 select GENERIC_IO
+1 -1
arch/x86/um/sys_call_table_32.c
··· 34 34 35 35 extern asmlinkage void sys_ni_syscall(void); 36 36 37 - const sys_call_ptr_t sys_call_table[] __cacheline_aligned = { 37 + const sys_call_ptr_t sys_call_table[] ____cacheline_aligned = { 38 38 /* 39 39 * Smells like a compiler bug -- it doesn't work 40 40 * when the & below is removed.
+1 -1
arch/x86/um/sys_call_table_64.c
··· 47 47 48 48 extern void sys_ni_syscall(void); 49 49 50 - const sys_call_ptr_t sys_call_table[] __cacheline_aligned = { 50 + const sys_call_ptr_t sys_call_table[] ____cacheline_aligned = { 51 51 /* 52 52 * Smells like a compiler bug -- it doesn't work 53 53 * when the & below is removed.