Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 693a30b8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4bf9636c b485342b

arch/um/Kconfig.common

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config UML 
	default y

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_UID16

	select HAVE_FUTEX_CMPXCHG if FUTEX

	select GENERIC_IRQ_SHOW

	select GENERIC_CPU_DEVICES

	select GENERIC_IO

arch/x86/um/sys_call_table_32.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ typedef asmlinkage void (*sys_call_ptr_t)(void); 


extern asmlinkage void sys_ni_syscall(void);



const sys_call_ptr_t sys_call_table[] __cacheline_aligned = {

const sys_call_ptr_t sys_call_table[] ____cacheline_aligned = {

	/*

	 * Smells like a compiler bug -- it doesn't work

	 * when the & below is removed.

arch/x86/um/sys_call_table_64.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ typedef void (*sys_call_ptr_t)(void); 


extern void sys_ni_syscall(void);



const sys_call_ptr_t sys_call_table[] __cacheline_aligned = {

const sys_call_ptr_t sys_call_table[] ____cacheline_aligned = {

	/*

	 * Smells like a compiler bug -- it doesn't work

	 * when the & below is removed.