diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-04-20 10:07:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-04-20 10:07:12 +0200 |
| commit | afa7a17f3aafb64647ba4cd38e20f3d678c7949b (patch) | |
| tree | 7cc16805d61da9670a96e17c25307a4a4972fe67 /include | |
| parent | Merge tag 'perf-core-for-mingo-4.12-20170413' of git://git.kernel.org/pub/scm... (diff) | |
| parent | x86/arch_prctl: Add ARCH_[GET|SET]_CPUID (diff) | |
| download | linux-afa7a17f3aafb64647ba4cd38e20f3d678c7949b.tar.xz linux-afa7a17f3aafb64647ba4cd38e20f3d678c7949b.zip | |
Merge branch 'WIP.x86/process' into perf/core
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/compat.h | 2 | ||||
| -rw-r--r-- | include/linux/thread_info.h | 4 |
2 files changed, 6 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 diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h index 58373875e8ee..55125d674338 100644 --- a/include/linux/thread_info.h +++ b/include/linux/thread_info.h @@ -101,6 +101,10 @@ static inline void check_object_size(const void *ptr, unsigned long n, { } #endif /* CONFIG_HARDENED_USERCOPY */ +#ifndef arch_setup_new_exec +static inline void arch_setup_new_exec(void) { } +#endif + #endif /* __KERNEL__ */ #endif /* _LINUX_THREAD_INFO_H */ |