diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-04-24 23:31:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-04-24 23:31:35 +0200 |
| commit | fd7647979a3948dae4fc6f25dbbdf9ba269bed78 (patch) | |
| tree | 3564d53e2242beb9616ad050a6142de689cf814a /include/linux/compat.h | |
| parent | e720c19e0d5412f45736d62258d21dc7b056c4ad (diff) | |
| parent | 9d43f5e8df6804ae271407500af9062e9278167a (diff) | |
| download | kernel_replicant_linux-fd7647979a3948dae4fc6f25dbbdf9ba269bed78.tar.gz kernel_replicant_linux-fd7647979a3948dae4fc6f25dbbdf9ba269bed78.tar.bz2 kernel_replicant_linux-fd7647979a3948dae4fc6f25dbbdf9ba269bed78.zip | |
Merge tag 'perf-core-for-mingo-4.12-20170424' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
User visible changes:
- Fix display of data source snoop indication in 'perf mem' (Andi Kleen)
- Fix the code to strip command name from /proc/PID/stat (Jiri Olsa)
Infrastructure changes:
- Continue the disentanglement of headers, specially util.h (Arnaldo Carvalho de Melo)
- Synchronize some header files with the kernel (Arnaldo Carvalho de Melo)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/compat.h')
| -rw-r--r-- | include/linux/compat.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h index aef47be2a5c1..af9dbc44fd92 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -723,6 +723,8 @@ asmlinkage long compat_sys_sched_rr_get_interval(compat_pid_t pid, asmlinkage long compat_sys_fanotify_mark(int, unsigned int, __u32, __u32, int, const char __user *); +asmlinkage long compat_sys_arch_prctl(int option, unsigned long arg2); + /* * For most but not all architectures, "am I in a compat syscall?" and * "am I a compat task?" are the same question. For architectures on which |