diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-09-15 11:22:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-15 11:22:43 +0200 |
| commit | 164f1e89bb40fbcded8ff69e360a300cad10c65c (patch) | |
| tree | d88446e45f8e8054dd91465017d4c6ecb2ec76bb /arch/sparc | |
| parent | 2bf415dd125951edd5b587311a4f1aa967828246 (diff) | |
| parent | 9c03f1622af051004416dd3e24d8a0fa31e34178 (diff) | |
Merge branch 'linus' into auto-latest
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 5016f76ea98a..6f57325bb883 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]; |