Merge third patchbomb from Andrew Morton: - various misc things - a couple of lib/ optimisations - provide DIV_ROUND_CLOSEST_ULL() - checkpatch updates - rtc tree - befs, nilfs2, hfs, hfsplus, fatfs, adfs, affs, bfs - ptrace fixes - fork() fixes - seccomp cleanups - more mmap_sem hold time reductions from Davidlohr * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (138 commits) proc: show locks in /proc/pid/fdinfo/X docs: add missing and new /proc/PID/status file entries, fix typos drivers/rtc/rtc-at91rm9200.c: make IO endian agnostic Documentation/spi/spidev_test.c: fix warning drivers/rtc/rtc-s5m.c: allow usage on device type different than main MFD type .gitignore: ignore *.tar MAINTAINERS: add Mediatek SoC mailing list tomoyo: reduce mmap_sem hold for mm->exe_file powerpc/oprofile: reduce mmap_sem hold for exe_file oprofile: reduce mmap_sem hold for mm->exe_file mips: ip32: add platform data hooks to use DS1685 driver lib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text x86: switch to using asm-generic for seccomp.h sparc: switch to using asm-generic for seccomp.h powerpc: switch to using asm-generic for seccomp.h parisc: switch to using asm-generic for seccomp.h mips: switch to using asm-generic for seccomp.h microblaze: use asm-generic for seccomp.h arm: use asm-generic for seccomp.h seccomp: allow COMPAT sigreturn overrides ...
Showing the changes to include/asm-generic (1 of 158 files). Show all
Unified · Split
| @@ -17,7 +17,9 @@ · 16 unmodified lines | ||
| 17 | 17 | #define __NR_seccomp_read_32 __NR_read |
| 18 | 18 | #define __NR_seccomp_write_32 __NR_write |
| 19 | 19 | #define __NR_seccomp_exit_32 __NR_exit |
| 20 | +#ifndef __NR_seccomp_sigreturn_32 | |
| 20 | 21 | #define __NR_seccomp_sigreturn_32 __NR_rt_sigreturn |
| 22 | +#endif | |
| 21 | 23 | #endif /* CONFIG_COMPAT && ! already defined */ |
| 22 | 24 | |
| 23 | 25 | #define __NR_seccomp_read __NR_read |