diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-03 14:27:32 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-03 14:27:32 +1000 |
| commit | d079bd23f738e679e51c3ed3299b96d4e1c0b284 (patch) | |
| tree | 02e55311a322dc75775ed29e03c28b2a4872b395 /arch/x86/um | |
| parent | a46d9a418168bea55cc9a893dca1777d7f2210c4 (diff) | |
| parent | 3efe33f5d2da8bb38f4ca93d12ae4f69fedde32a (diff) | |
Merge remote-tracking branch 'audit/master'
Conflicts:
arch/mips/include/asm/syscall.h
arch/mips/kernel/ptrace.c
arch/x86/Kconfig
kernel/audit.c
Diffstat (limited to 'arch/x86/um')
| -rw-r--r-- | arch/x86/um/asm/ptrace.h | 4 | ||||
| -rw-r--r-- | arch/x86/um/asm/syscall.h | 15 |
2 files changed, 15 insertions, 4 deletions
diff --git a/arch/x86/um/asm/ptrace.h b/arch/x86/um/asm/ptrace.h index 54f8102ccde..e59eef20647 100644 --- a/arch/x86/um/asm/ptrace.h +++ b/arch/x86/um/asm/ptrace.h @@ -47,8 +47,6 @@ struct user_desc; #ifdef CONFIG_X86_32 -#define HOST_AUDIT_ARCH AUDIT_ARCH_I386 - extern int ptrace_get_thread_area(struct task_struct *child, int idx, struct user_desc __user *user_desc); @@ -57,8 +55,6 @@ extern int ptrace_set_thread_area(struct task_struct *child, int idx, #else -#define HOST_AUDIT_ARCH AUDIT_ARCH_X86_64 - #define PT_REGS_R8(r) UPT_R8(&(r)->regs) #define PT_REGS_R9(r) UPT_R9(&(r)->regs) #define PT_REGS_R10(r) UPT_R10(&(r)->regs) diff --git a/arch/x86/um/asm/syscall.h b/arch/x86/um/asm/syscall.h new file mode 100644 index 00000000000..9fe77b7b5a0 --- /dev/null +++ b/arch/x86/um/asm/syscall.h @@ -0,0 +1,15 @@ +#ifndef __UM_ASM_SYSCALL_H +#define __UM_ASM_SYSCALL_H + +#include <uapi/linux/audit.h> + +static inline int syscall_get_arch(void) +{ +#ifdef CONFIG_X86_32 + return AUDIT_ARCH_I386; +#else + return AUDIT_ARCH_X86_64; +#endif +} + +#endif /* __UM_ASM_SYSCALL_H */ |