--- trunk/kernel26-magellan/patches-2.6.35-r3/0301-2.6.35-CVE-2010-3301.patch 2010/09/18 11:01:49 1136 +++ trunk/kernel26-magellan/patches-2.6.35-r3/0301-2.6.35-CVE-2010-3301.patch 2010/09/20 07:44:10 1137 @@ -46,7 +46,6 @@ arch/powerpc/include/asm/compat.h | 2 +- arch/s390/include/asm/compat.h | 2 +- arch/sparc/include/asm/compat.h | 2 +- - arch/tile/include/asm/compat.h | 2 +- arch/x86/include/asm/compat.h | 2 +- include/linux/compat.h | 3 +++ kernel/compat.c | 21 +++++++++++++++++++++ @@ -130,19 +129,6 @@ { struct pt_regs *regs = current_thread_info()->kregs; unsigned long usp = regs->u_regs[UREG_I6]; -diff --git a/arch/tile/include/asm/compat.h b/arch/tile/include/asm/compat.h -index 5a34da6..345d81c 100644 ---- a/arch/tile/include/asm/compat.h -+++ b/arch/tile/include/asm/compat.h -@@ -195,7 +195,7 @@ static inline unsigned long ptr_to_compat_reg(void __user *uptr) - return (long)(int)(long __force)uptr; - } - --static inline void __user *compat_alloc_user_space(long len) -+static inline void __user *arch_compat_alloc_user_space(long len) - { - struct pt_regs *regs = task_pt_regs(current); - return (void __user *)regs->sp - len; diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h index 306160e..1d9cd27 100644 --- a/arch/x86/include/asm/compat.h