diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-23 07:51:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-23 07:51:20 -0700 |
| commit | d0b72a0817b0164986d35366c8ffe92fd985f713 (patch) | |
| tree | 0fde19a1454d8e91e7350dea9192f3a42244c3a4 | |
| parent | 2e11665c5ea436e2fc2cfecbfc6dbfb8d420af29 (diff) | |
| parent | a94b1d1fd7ca3129e1d38d38167779fa6ee69780 (diff) | |
| download | op-kernel-dev-d0b72a0817b0164986d35366c8ffe92fd985f713.zip op-kernel-dev-d0b72a0817b0164986d35366c8ffe92fd985f713.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: 8-byte align return value from compat_alloc_user_space()
| -rw-r--r-- | include/asm-sparc64/compat.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/asm-sparc64/compat.h b/include/asm-sparc64/compat.h index c73935d..36511ca 100644 --- 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; } -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]; @@ -174,7 +174,10 @@ static __inline__ void __user *compat_alloc_user_space(long len) else usp &= 0xffffffffUL; - return (void __user *) (usp - len); + usp -= len; + usp &= ~0x7UL; + + return (void __user *) usp; } struct compat_ipc64_perm { |
