History

Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King: "Just two changes this time around: - wire up the new mlock2 syscall added during the last merge window - fix a build problem with certain configurations provoked by making CONFIG_OF user selectable" * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: ARM: 8454/1: OF implies OF_FLATTREE ARM: wire up mlock2 syscall

Linus Torvalds committed 10 years ago

Commit 04527fd2 parents 36511e8 aa7d5f13 files · +4 −2Browse files

Unified · Split

3 files
  1. arch/arm/Kconfig +2 −2
  2. arch/arm/include/uapi/asm/unistd.h +1 −0
  3. arch/arm/kernel/calls.S +1 −0
arch/arm/Kconfig+2−2
@@ -76,6 +76,8 @@ config ARM · 75 unmodified lines
7676 select IRQ_FORCED_THREADING
7777 select MODULES_USE_ELF_REL
7878 select NO_BOOTMEM
79+ select OF_EARLY_FLATTREE if OF
80+ select OF_RESERVED_MEM if OF
7981 select OLD_SIGACTION
8082 select OLD_SIGSUSPEND3
8183 select PERF_USE_VMALLOC
@@ -1822,8 +1824,6 @@ config USE_OF · 1740 unmodified lines
18221824 bool "Flattened Device Tree support"
18231825 select IRQ_DOMAIN
18241826 select OF
1825− select OF_EARLY_FLATTREE
1826− select OF_RESERVED_MEM
18271827 help
18281828 Include support for flattened device tree machine descriptions.
18291829
arch/arm/include/uapi/asm/unistd.h+1−0
@@ -416,6 +416,7 @@ · 415 unmodified lines
416416 #define __NR_execveat (__NR_SYSCALL_BASE+387)
417417 #define __NR_userfaultfd (__NR_SYSCALL_BASE+388)
418418 #define __NR_membarrier (__NR_SYSCALL_BASE+389)
419+#define __NR_mlock2 (__NR_SYSCALL_BASE+390)
419420
420421 /*
421422 * The following SWIs are ARM private.
arch/arm/kernel/calls.S+1−0
@@ -399,6 +399,7 @@ · 398 unmodified lines
399399 CALL(sys_execveat)
400400 CALL(sys_userfaultfd)
401401 CALL(sys_membarrier)
402+ CALL(sys_mlock2)
402403 #ifndef syscalls_counted
403404 .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
404405 #define syscalls_counted