The patch titled Subject: mips: switch to using asm-generic for seccomp.h has been added to the -mm tree. Its filename is mips-switch-to-using-asm-generic-for-seccomph.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mips-switch-to-using-asm-generic-for-seccomph.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mips-switch-to-using-asm-generic-for-seccomph.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Kees Cook <keescook@xxxxxxxxxxxx> Subject: mips: switch to using asm-generic for seccomp.h Switch to using the newly created asm-generic/seccomp.h for the seccomp strict mode syscall definitions. COMPAT definitions retain their overrides and the remaining definitions were identical. Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx> Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/mips/include/asm/seccomp.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff -puN arch/mips/include/asm/seccomp.h~mips-switch-to-using-asm-generic-for-seccomph arch/mips/include/asm/seccomp.h --- a/arch/mips/include/asm/seccomp.h~mips-switch-to-using-asm-generic-for-seccomph +++ a/arch/mips/include/asm/seccomp.h @@ -2,11 +2,6 @@ #include <linux/unistd.h> -#define __NR_seccomp_read __NR_read -#define __NR_seccomp_write __NR_write -#define __NR_seccomp_exit __NR_exit -#define __NR_seccomp_sigreturn __NR_rt_sigreturn - /* * Kludge alert: * @@ -29,4 +24,6 @@ #endif /* CONFIG_MIPS32_O32 */ +#include <asm-generic/seccomp.h> + #endif /* __ASM_SECCOMP_H */ _ Patches currently in -mm which might be from keescook@xxxxxxxxxxxx are origin.patch arm-factor-out-mmap-aslr-into-mmap_rnd.patch x86-standardize-mmap_rnd-usage.patch arm64-standardize-mmap_rnd-usage.patch arm64-standardize-mmap_rnd-usage-v4.patch mips-extract-logic-for-mmap_rnd.patch mips-extract-logic-for-mmap_rnd-v4.patch powerpc-standardize-mmap_rnd-usage.patch powerpc-standardize-mmap_rnd-usage-v4.patch s390-standardize-mmap_rnd-usage.patch mm-expose-arch_mmap_rnd-when-available.patch s390-redefine-randomize_et_dyn-for-elf_et_dyn_base.patch mm-split-et_dyn-aslr-from-mmap-aslr.patch mm-fold-arch_randomize_brk-into-arch_has_elf_randomize.patch lib-vsprintf-add-%pt-format-specifier.patch seccomp-allow-compat-sigreturn-overrides.patch arm-use-asm-generic-for-seccomph.patch microblaze-use-asm-generic-for-seccomph.patch mips-switch-to-using-asm-generic-for-seccomph.patch parisc-switch-to-using-asm-generic-for-seccomph.patch powerpc-switch-to-using-asm-generic-for-seccomph.patch sparc-switch-to-using-asm-generic-for-seccomph.patch x86-switch-to-using-asm-generic-for-seccomph.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html