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 arch/powerpc/include/uapi (2 of 158 files). Show all
Unified · Split
| @@ -25,7 +25,6 @@ header-y += posix_types.h · 24 unmodified lines | ||
| 25 | 25 | header-y += ps3fb.h |
| 26 | 26 | header-y += ptrace.h |
| 27 | 27 | header-y += resource.h |
| 28 | −header-y += seccomp.h | |
| 29 | 28 | header-y += sembuf.h |
| 30 | 29 | header-y += setup.h |
| 31 | 30 | header-y += shmbuf.h |
| @@ -1,16 +0,0 @@ | ||
| 1 | −#ifndef _ASM_POWERPC_SECCOMP_H | |
| 2 | −#define _ASM_POWERPC_SECCOMP_H | |
| 3 | − | |
| 4 | −#include <linux/unistd.h> | |
| 5 | − | |
| 6 | −#define __NR_seccomp_read __NR_read | |
| 7 | −#define __NR_seccomp_write __NR_write | |
| 8 | −#define __NR_seccomp_exit __NR_exit | |
| 9 | −#define __NR_seccomp_sigreturn __NR_rt_sigreturn | |
| 10 | − | |
| 11 | −#define __NR_seccomp_read_32 __NR_read | |
| 12 | −#define __NR_seccomp_write_32 __NR_write | |
| 13 | −#define __NR_seccomp_exit_32 __NR_exit | |
| 14 | −#define __NR_seccomp_sigreturn_32 __NR_sigreturn | |
| 15 | − | |
| 16 | −#endif /* _ASM_POWERPC_SECCOMP_H */ | |