diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
| commit | cf816ecb533ab96b883dfdc0db174598b5b5c4d2 (patch) | |
| tree | 1b7705db288ae2917105e624b01fdf81e0882bf1 /include/asm-x86/compat.h | |
| parent | adf6d34e460387ee3e8f1e1875d52bff51212c7d (diff) | |
| parent | 15f7d677ccff6f0f5de8a1ee43a792567e9f9de9 (diff) | |
Merge branch 'merge-fixes' into devel
Diffstat (limited to 'include/asm-x86/compat.h')
| -rw-r--r-- | include/asm-x86/compat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86/compat.h b/include/asm-x86/compat.h index d3e8f3e87ee8..1793ac317a30 100644 --- a/include/asm-x86/compat.h +++ b/include/asm-x86/compat.h | |||
| @@ -204,7 +204,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr) | |||
| 204 | return (u32)(unsigned long)uptr; | 204 | return (u32)(unsigned long)uptr; |
| 205 | } | 205 | } |
| 206 | 206 | ||
| 207 | static __inline__ void __user *compat_alloc_user_space(long len) | 207 | static inline void __user *compat_alloc_user_space(long len) |
| 208 | { | 208 | { |
| 209 | struct pt_regs *regs = task_pt_regs(current); | 209 | struct pt_regs *regs = task_pt_regs(current); |
| 210 | return (void __user *)regs->sp - len; | 210 | return (void __user *)regs->sp - len; |