diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-04-21 11:55:06 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-04-21 11:55:06 +0200 |
| commit | 8afd74c2961a7544b0d73fad2d92f2cb65502e99 (patch) | |
| tree | 784dbe0dfe96dd0a3f0e10153ca42b11d9e961b6 /include | |
| parent | fe0e80befd4d3a62d40f24b98b17483ea00ef2dd (diff) | |
| parent | f3e4559781bf0c393364baa6b772233088a711db (diff) | |
| download | linux-8afd74c2961a7544b0d73fad2d92f2cb65502e99.tar.gz linux-8afd74c2961a7544b0d73fad2d92f2cb65502e99.tar.bz2 linux-8afd74c2961a7544b0d73fad2d92f2cb65502e99.zip | |
Merge branch 'x86/process' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into HEAD
Required for KVM support of the CPUID faulting feature.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
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 */ |