diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-12-15 18:35:24 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-12-15 18:35:24 -0500 |
| commit | 2a1e1379bae53f647c463a677cc2ec71b591c348 (patch) | |
| tree | a152beb5e8679e94430c5b47bf798dd8a2d4fd5d /arch/ia64/kernel/process.c | |
| parent | 787926b1b2d21d42ca462dc736b77f1a4a30c503 (diff) | |
| parent | 7b6666530e2736f190a2629c8abe34275054449f (diff) | |
Merge by hand (conflicts in scsi_lib.c)
This merge is pretty extensive. The conflict is over the new
req->retries parameter, so I had to change the prototype to
scsi_setup_blk_pc_cmnd() and the usage in sd, sr and st.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/ia64/kernel/process.c')
| -rw-r--r-- | arch/ia64/kernel/process.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index a4da715a360c..e9904c74d2ba 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c | |||
| @@ -721,11 +721,13 @@ flush_thread (void) | |||
| 721 | /* drop floating-point and debug-register state if it exists: */ | 721 | /* drop floating-point and debug-register state if it exists: */ |
| 722 | current->thread.flags &= ~(IA64_THREAD_FPH_VALID | IA64_THREAD_DBG_VALID); | 722 | current->thread.flags &= ~(IA64_THREAD_FPH_VALID | IA64_THREAD_DBG_VALID); |
| 723 | ia64_drop_fpu(current); | 723 | ia64_drop_fpu(current); |
| 724 | #ifdef CONFIG_IA32_SUPPORT | ||
| 724 | if (IS_IA32_PROCESS(ia64_task_regs(current))) { | 725 | if (IS_IA32_PROCESS(ia64_task_regs(current))) { |
| 725 | ia32_drop_partial_page_list(current); | 726 | ia32_drop_partial_page_list(current); |
| 726 | current->thread.task_size = IA32_PAGE_OFFSET; | 727 | current->thread.task_size = IA32_PAGE_OFFSET; |
| 727 | set_fs(USER_DS); | 728 | set_fs(USER_DS); |
| 728 | } | 729 | } |
| 730 | #endif | ||
| 729 | } | 731 | } |
| 730 | 732 | ||
| 731 | /* | 733 | /* |