diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-14 17:07:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-14 17:07:51 -0700 |
| commit | 9c03f1622af051004416dd3e24d8a0fa31e34178 (patch) | |
| tree | e7dad951e3b2eeb691cb7d5970e3c728176972c3 /arch/ia64/include | |
| parent | a4128b03ff1ff5bc6ea922518a3f36a09b914379 (diff) | |
| parent | eefdca043e8391dcd719711716492063030b55ac (diff) | |
| download | kernel_samsung_smdk4412-9c03f1622af051004416dd3e24d8a0fa31e34178.zip kernel_samsung_smdk4412-9c03f1622af051004416dd3e24d8a0fa31e34178.tar.gz kernel_samsung_smdk4412-9c03f1622af051004416dd3e24d8a0fa31e34178.tar.bz2 | |
Merge ssh://master.kernel.org/home/hpa/tree/sec
* ssh://master.kernel.org/home/hpa/tree/sec:
x86-64, compat: Retruncate rax after ia32 syscall entry tracing
x86-64, compat: Test %rax for the syscall number, not %eax
compat: Make compat_alloc_user_space() incorporate the access_ok()
Diffstat (limited to 'arch/ia64/include')
| -rw-r--r-- | arch/ia64/include/asm/compat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/compat.h b/arch/ia64/include/asm/compat.h index f90edc8..9301a28 100644 --- a/arch/ia64/include/asm/compat.h +++ b/arch/ia64/include/asm/compat.h @@ -199,7 +199,7 @@ ptr_to_compat(void __user *uptr) } static __inline__ void __user * -compat_alloc_user_space (long len) +arch_compat_alloc_user_space (long len) { struct pt_regs *regs = task_pt_regs(current); return (void __user *) (((regs->r12 & 0xffffffff) & -16) - len); |