Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

1 files changed, 4 insertions, 1 deletions

diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 2e33665d9c18..a4da715a360c 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -721,8 +721,11 @@ flush_thread (void)
         /* drop floating-point and debug-register state if it exists: */
         current->thread.flags &= ~(IA64_THREAD_FPH_VALID | IA64_THREAD_DBG_VALID);
         ia64_drop_fpu(current);
-        if (IS_IA32_PROCESS(ia64_task_regs(current)))
+        if (IS_IA32_PROCESS(ia64_task_regs(current))) {
                 ia32_drop_partial_page_list(current);
+                current->thread.task_size = IA32_PAGE_OFFSET;
+                set_fs(USER_DS);
+        }
 }
 
 /*