Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 693a30b8f19a964087a3762d09fb2e1cbad6b0d4

Authored by Linus Torvalds
2 parents 4bf9636c39 b485342bd7
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

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

Showing 3 changed files Side-by-side Diff

arch/um/Kconfig.common
Diff comments   View file @ 693a30b
... ... @@ -3,6 +3,7 @@
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
arch/x86/um/sys_call_table_32.c
Diff comments   View file @ 693a30b
... ... @@ -34,7 +34,7 @@
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.
arch/x86/um/sys_call_table_64.c
Diff comments   View file @ 693a30b
... ... @@ -47,7 +47,7 @@
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.