diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:34:32 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:34:32 -0500 |
| commit | 525352eb6d355bef6adf597252fc6d04f2dbe66c (patch) | |
| tree | 4d2b42372ec0ac985f2775b0ea260c707e93fdd4 /arch/ia64/kernel/process.c | |
| parent | d51e86c18a479f1dbcef3aa20e58ad04d1233016 (diff) | |
| parent | 0e670506668a43e1355b8f10c33d081a676bd521 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/ia64/kernel/process.c')
| -rw-r--r-- | arch/ia64/kernel/process.c | 5 |
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); + } } /* |