3 files changed, 4 insertions, 2 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0365cbbc9179..34e1569a11ee 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -76,6 +76,8 @@ config ARM
         select IRQ_FORCED_THREADING
         select MODULES_USE_ELF_REL
         select NO_BOOTMEM
+        select OF_EARLY_FLATTREE if OF
+        select OF_RESERVED_MEM if OF
         select OLD_SIGACTION
         select OLD_SIGSUSPEND3
         select PERF_USE_VMALLOC
@@ -1822,8 +1824,6 @@ config USE_OF
         bool "Flattened Device Tree support"
         select IRQ_DOMAIN
         select OF
-        select OF_EARLY_FLATTREE
-        select OF_RESERVED_MEM
         help
           Include support for flattened device tree machine descriptions.
 
diff --git a/arch/arm/include/uapi/asm/unistd.h b/arch/arm/include/uapi/asm/unistd.h
index 7a2a32a1d5a8..ede692ffa32e 100644
--- a/arch/arm/include/uapi/asm/unistd.h
+++ b/arch/arm/include/uapi/asm/unistd.h
@@ -416,6 +416,7 @@
 #define __NR_execveat                   (__NR_SYSCALL_BASE+387)
 #define __NR_userfaultfd                (__NR_SYSCALL_BASE+388)
 #define __NR_membarrier                 (__NR_SYSCALL_BASE+389)
+#define __NR_mlock2                     (__NR_SYSCALL_BASE+390)
 
 /*
  * The following SWIs are ARM private.
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index fde6c88d560c..ac368bb068d1 100644
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -399,6 +399,7 @@
                 CALL(sys_execveat)
                 CALL(sys_userfaultfd)
                 CALL(sys_membarrier)
+                CALL(sys_mlock2)
 #ifndef syscalls_counted
 .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
 #define syscalls_counted