projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
[cascardo/linux.git]
/
include
/
asm-x86
/
compat.h
diff --git
a/include/asm-x86/compat.h
b/include/asm-x86/compat.h
index
d3e8f3e
..
1793ac3
100644
(file)
--- 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)
return (u32)(unsigned long)uptr;
}
-static
__inline__
void __user *compat_alloc_user_space(long len)
+static
inline
void __user *compat_alloc_user_space(long len)
{
struct pt_regs *regs = task_pt_regs(current);
return (void __user *)regs->sp - len;