* [merged] mips-add-entry-for-new-mlock2-syscall.patch removed from -mm tree
@ 2015-11-10 20:32 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2015-11-10 20:32 UTC (permalink / raw)
To: emunson, catalin.marinas, corbet, geert, heiko.carstens,
kirill.shutemov, linux, mhocko, mtk.manpages, ralf, sfr, shuahkh,
vbabka, mm-commits
The patch titled
Subject: mips: add entry for new mlock2 syscall
has been removed from the -mm tree. Its filename was
mips-add-entry-for-new-mlock2-syscall.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Eric B Munson <emunson@akamai.com>
Subject: mips: add entry for new mlock2 syscall
A previous commit introduced the new mlock2 syscall, add entries for the
MIPS architecture.
Signed-off-by: Eric B Munson <emunson@akamai.com>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Michael Kerrisk <mtk.manpages@gmail.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Shuah Khan <shuahkh@osg.samsung.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
arch/mips/include/uapi/asm/unistd.h | 15 +++++++++------
arch/mips/kernel/scall32-o32.S | 1 +
arch/mips/kernel/scall64-64.S | 1 +
arch/mips/kernel/scall64-n32.S | 1 +
arch/mips/kernel/scall64-o32.S | 1 +
5 files changed, 13 insertions(+), 6 deletions(-)
diff -puN arch/mips/include/uapi/asm/unistd.h~mips-add-entry-for-new-mlock2-syscall arch/mips/include/uapi/asm/unistd.h
--- a/arch/mips/include/uapi/asm/unistd.h~mips-add-entry-for-new-mlock2-syscall
+++ a/arch/mips/include/uapi/asm/unistd.h
@@ -379,16 +379,17 @@
#define __NR_execveat (__NR_Linux + 356)
#define __NR_userfaultfd (__NR_Linux + 357)
#define __NR_membarrier (__NR_Linux + 358)
+#define __NR_mlock2 (__NR_Linux + 359)
/*
* Offset of the last Linux o32 flavoured syscall
*/
-#define __NR_Linux_syscalls 358
+#define __NR_Linux_syscalls 359
#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
#define __NR_O32_Linux 4000
-#define __NR_O32_Linux_syscalls 358
+#define __NR_O32_Linux_syscalls 359
#if _MIPS_SIM == _MIPS_SIM_ABI64
@@ -715,16 +716,17 @@
#define __NR_execveat (__NR_Linux + 316)
#define __NR_userfaultfd (__NR_Linux + 317)
#define __NR_membarrier (__NR_Linux + 318)
+#define __NR_mlock2 (__NR_Linux + 319)
/*
* Offset of the last Linux 64-bit flavoured syscall
*/
-#define __NR_Linux_syscalls 318
+#define __NR_Linux_syscalls 319
#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
#define __NR_64_Linux 5000
-#define __NR_64_Linux_syscalls 318
+#define __NR_64_Linux_syscalls 319
#if _MIPS_SIM == _MIPS_SIM_NABI32
@@ -1055,15 +1057,16 @@
#define __NR_execveat (__NR_Linux + 320)
#define __NR_userfaultfd (__NR_Linux + 321)
#define __NR_membarrier (__NR_Linux + 322)
+#define __NR_mlock2 (__NR_Linux + 323)
/*
* Offset of the last N32 flavoured syscall
*/
-#define __NR_Linux_syscalls 322
+#define __NR_Linux_syscalls 323
#endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
#define __NR_N32_Linux 6000
-#define __NR_N32_Linux_syscalls 322
+#define __NR_N32_Linux_syscalls 323
#endif /* _UAPI_ASM_UNISTD_H */
diff -puN arch/mips/kernel/scall32-o32.S~mips-add-entry-for-new-mlock2-syscall arch/mips/kernel/scall32-o32.S
--- a/arch/mips/kernel/scall32-o32.S~mips-add-entry-for-new-mlock2-syscall
+++ a/arch/mips/kernel/scall32-o32.S
@@ -594,3 +594,4 @@ EXPORT(sys_call_table)
PTR sys_execveat
PTR sys_userfaultfd
PTR sys_membarrier
+ PTR sys_mlock2
diff -puN arch/mips/kernel/scall64-64.S~mips-add-entry-for-new-mlock2-syscall arch/mips/kernel/scall64-64.S
--- a/arch/mips/kernel/scall64-64.S~mips-add-entry-for-new-mlock2-syscall
+++ a/arch/mips/kernel/scall64-64.S
@@ -432,4 +432,5 @@ EXPORT(sys_call_table)
PTR sys_execveat
PTR sys_userfaultfd
PTR sys_membarrier
+ PTR sys_mlock2
.size sys_call_table,.-sys_call_table
diff -puN arch/mips/kernel/scall64-n32.S~mips-add-entry-for-new-mlock2-syscall arch/mips/kernel/scall64-n32.S
--- a/arch/mips/kernel/scall64-n32.S~mips-add-entry-for-new-mlock2-syscall
+++ a/arch/mips/kernel/scall64-n32.S
@@ -422,4 +422,5 @@ EXPORT(sysn32_call_table)
PTR compat_sys_execveat /* 6320 */
PTR sys_userfaultfd
PTR sys_membarrier
+ PTR sys_mlock2
.size sysn32_call_table,.-sysn32_call_table
diff -puN arch/mips/kernel/scall64-o32.S~mips-add-entry-for-new-mlock2-syscall arch/mips/kernel/scall64-o32.S
--- a/arch/mips/kernel/scall64-o32.S~mips-add-entry-for-new-mlock2-syscall
+++ a/arch/mips/kernel/scall64-o32.S
@@ -577,4 +577,5 @@ EXPORT(sys32_call_table)
PTR compat_sys_execveat
PTR sys_userfaultfd
PTR sys_membarrier
+ PTR sys_mlock2
.size sys32_call_table,.-sys32_call_table
_
Patches currently in -mm which might be from emunson@akamai.com are
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-11-10 20:33 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-10 20:32 [merged] mips-add-entry-for-new-mlock2-syscall.patch removed from -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.