diff options
| author | akpm@linux-foundation.org <akpm@linux-foundation.org> | 2007-07-25 04:44:55 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-07-25 21:56:39 +0200 |
| commit | 3b74d18e54e20fc1d398eb391bea5b9aed22aca5 (patch) | |
| tree | ab0c4f72ce87ea02978799c9e3fdc79c05bd1c9b /arch/ia64/kernel | |
| parent | [IA64] Ensure that machvec is set up takes place before serial console (diff) | |
| download | linux-3b74d18e54e20fc1d398eb391bea5b9aed22aca5.tar.xz linux-3b74d18e54e20fc1d398eb391bea5b9aed22aca5.zip | |
[IA64] rename partial_page
Jens has added a partial_page thing in splice whcih conflicts with the ia64
one. Rename ia64 out of the way. (ia64 chose poorly).
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel')
| -rw-r--r-- | arch/ia64/kernel/process.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index fa40cba43350..4158906c45aa 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c @@ -499,7 +499,8 @@ copy_thread (int nr, unsigned long clone_flags, /* Copy partially mapped page list */ if (!retval) - retval = ia32_copy_partial_page_list(p, clone_flags); + retval = ia32_copy_ia64_partial_page_list(p, + clone_flags); } #endif @@ -728,7 +729,7 @@ flush_thread (void) ia64_drop_fpu(current); #ifdef CONFIG_IA32_SUPPORT if (IS_IA32_PROCESS(task_pt_regs(current))) { - ia32_drop_partial_page_list(current); + ia32_drop_ia64_partial_page_list(current); current->thread.task_size = IA32_PAGE_OFFSET; set_fs(USER_DS); } @@ -754,7 +755,7 @@ exit_thread (void) pfm_release_debug_registers(current); #endif if (IS_IA32_PROCESS(task_pt_regs(current))) - ia32_drop_partial_page_list(current); + ia32_drop_ia64_partial_page_list(current); } unsigned long |