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

Configure Feed

Select the types of activity you want to include in your feed.

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 04527fda 36511e86

+4 -2
+2 -2
arch/arm/Kconfig
··· 76 76 select IRQ_FORCED_THREADING 77 77 select MODULES_USE_ELF_REL 78 78 select NO_BOOTMEM 79 + select OF_EARLY_FLATTREE if OF 80 + select OF_RESERVED_MEM if OF 79 81 select OLD_SIGACTION 80 82 select OLD_SIGSUSPEND3 81 83 select PERF_USE_VMALLOC ··· 1824 1822 bool "Flattened Device Tree support" 1825 1823 select IRQ_DOMAIN 1826 1824 select OF 1827 - select OF_EARLY_FLATTREE 1828 - select OF_RESERVED_MEM 1829 1825 help 1830 1826 Include support for flattened device tree machine descriptions. 1831 1827
+1
arch/arm/include/uapi/asm/unistd.h
··· 416 416 #define __NR_execveat (__NR_SYSCALL_BASE+387) 417 417 #define __NR_userfaultfd (__NR_SYSCALL_BASE+388) 418 418 #define __NR_membarrier (__NR_SYSCALL_BASE+389) 419 + #define __NR_mlock2 (__NR_SYSCALL_BASE+390) 419 420 420 421 /* 421 422 * The following SWIs are ARM private.
+1
arch/arm/kernel/calls.S
··· 399 399 CALL(sys_execveat) 400 400 CALL(sys_userfaultfd) 401 401 CALL(sys_membarrier) 402 + CALL(sys_mlock2) 402 403 #ifndef syscalls_counted 403 404 .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls 404 405 #define syscalls_counted