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/sparc | |
| parent | a4128b03ff1ff5bc6ea922518a3f36a09b914379 (diff) | |
| parent | eefdca043e8391dcd719711716492063030b55ac (diff) | |
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/sparc')
| -rw-r--r-- | arch/sparc/include/asm/compat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/compat.h b/arch/sparc/include/asm/compat.h index 5016f76ea98..6f57325bb88 100644 --- a/arch/sparc/include/asm/compat.h +++ b/arch/sparc/include/asm/compat.h @@ -167,7 +167,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr) return (u32)(unsigned long)uptr; } -static inline void __user *compat_alloc_user_space(long len) +static inline void __user *arch_compat_alloc_user_space(long len) { struct pt_regs *regs = current_thread_info()->kregs; unsigned long usp = regs->u_regs[UREG_I6]; |