summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-12-30 16:01:52 -0500
committerArnd Bergmann <arnd@arndb.de>2019-01-25 11:22:50 -0500
commit4ab65ba7a5cbad47520274d88d066bf8eb83f161 (patch)
treebc59f613638445ca5631c6359df759720fdd7fc0
parent78594b95998f1496e25411c6b7c7041bcb9bf7d1 (diff)
ARM: add kexec_file_load system call number
A couple of architectures including arm64 already implement the kexec_file_load system call, on many others we have assigned a system call number for it, but not implemented it yet. Adding the number in arch/arm/ lets us use the system call on arm64 systems in compat mode, and also reduces the number of differences between architectures. If we want to implement kexec_file_load on ARM in the future, the number assignment means that kexec tools can already be built with the now current set of kernel headers. Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/tools/syscall.tbl1
-rw-r--r--arch/arm64/include/asm/unistd.h2
-rw-r--r--arch/arm64/include/asm/unistd32.h2
3 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl
index 86de9eb34296..20ed7e026723 100644
--- a/arch/arm/tools/syscall.tbl
+++ b/arch/arm/tools/syscall.tbl
@@ -415,3 +415,4 @@
415398 common rseq sys_rseq 415398 common rseq sys_rseq
416399 common io_pgetevents sys_io_pgetevents 416399 common io_pgetevents sys_io_pgetevents
417400 common migrate_pages sys_migrate_pages 417400 common migrate_pages sys_migrate_pages
418401 common kexec_file_load sys_kexec_file_load
diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h
index 261216c3336e..2c30e6f145ff 100644
--- a/arch/arm64/include/asm/unistd.h
+++ b/arch/arm64/include/asm/unistd.h
@@ -44,7 +44,7 @@
44#define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE + 5) 44#define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE + 5)
45#define __ARM_NR_COMPAT_END (__ARM_NR_COMPAT_BASE + 0x800) 45#define __ARM_NR_COMPAT_END (__ARM_NR_COMPAT_BASE + 0x800)
46 46
47#define __NR_compat_syscalls 401 47#define __NR_compat_syscalls 402
48#endif 48#endif
49 49
50#define __ARCH_WANT_SYS_CLONE 50#define __ARCH_WANT_SYS_CLONE
diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h
index f15bcbacb8f6..8ca1d4c304f4 100644
--- a/arch/arm64/include/asm/unistd32.h
+++ b/arch/arm64/include/asm/unistd32.h
@@ -823,6 +823,8 @@ __SYSCALL(__NR_rseq, sys_rseq)
823__SYSCALL(__NR_io_pgetevents, compat_sys_io_pgetevents) 823__SYSCALL(__NR_io_pgetevents, compat_sys_io_pgetevents)
824#define __NR_migrate_pages 400 824#define __NR_migrate_pages 400
825__SYSCALL(__NR_migrate_pages, compat_sys_migrate_pages) 825__SYSCALL(__NR_migrate_pages, compat_sys_migrate_pages)
826#define __NR_kexec_file_load 401
827__SYSCALL(__NR_kexec_file_load, sys_kexec_file_load)
826 828
827/* 829/*
828 * Please add new compat syscalls above this comment and update 830 * Please add new compat syscalls above this comment and update