projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
[powerpc.git]
/
include
/
asm-sparc64
/
compat.h
diff --git
a/include/asm-sparc64/compat.h
b/include/asm-sparc64/compat.h
index
c73935d
..
36511ca
100644
(file)
--- a/
include/asm-sparc64/compat.h
+++ b/
include/asm-sparc64/compat.h
@@
-164,7
+164,7
@@
static inline compat_uptr_t ptr_to_compat(void __user *uptr)
return (u32)(unsigned long)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 = current_thread_info()->kregs;
unsigned long usp = regs->u_regs[UREG_I6];
{
struct pt_regs *regs = current_thread_info()->kregs;
unsigned long usp = regs->u_regs[UREG_I6];
@@
-174,7
+174,10
@@
static __inline__ void __user *compat_alloc_user_space(long len)
else
usp &= 0xffffffffUL;
else
usp &= 0xffffffffUL;
- return (void __user *) (usp - len);
+ usp -= len;
+ usp &= ~0x7UL;
+
+ return (void __user *) usp;
}
struct compat_ipc64_perm {
}
struct compat_ipc64_perm {