Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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()
+5
-2
+5
-2
include/asm-sparc64/compat.h
+5
-2
include/asm-sparc64/compat.h
···
164
164
return (u32)(unsigned long)uptr;
165
165
}
166
166
167
-
static __inline__ void __user *compat_alloc_user_space(long len)
167
+
static inline void __user *compat_alloc_user_space(long len)
168
168
{
169
169
struct pt_regs *regs = current_thread_info()->kregs;
170
170
unsigned long usp = regs->u_regs[UREG_I6];
···
174
174
else
175
175
usp &= 0xffffffffUL;
176
176
177
-
return (void __user *) (usp - len);
177
+
usp -= len;
178
+
usp &= ~0x7UL;
179
+
180
+
return (void __user *) usp;
178
181
}
179
182
180
183
struct compat_ipc64_perm {