From: "Ken'ichi Ohmichi" Signed-off-by: Ken'ichi Ohmichi Signed-off-by: Andrew Morton --- arch/ia64/kernel/machine_kexec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff -puN arch/ia64/kernel/machine_kexec.c~add-vmcore-use-the-existing-ia64_tpa-instead-of-asm-code arch/ia64/kernel/machine_kexec.c --- a/arch/ia64/kernel/machine_kexec.c~add-vmcore-use-the-existing-ia64_tpa-instead-of-asm-code +++ a/arch/ia64/kernel/machine_kexec.c @@ -21,6 +21,7 @@ #include #include #include +#include typedef NORET_TYPE void (*relocate_new_kernel_t)( unsigned long indirection_page, @@ -149,9 +150,6 @@ void arch_crash_save_vmcoreinfo(void) unsigned long paddr_vmcoreinfo_note(void) { - unsigned long vaddr, paddr; - vaddr = (unsigned long)(char *)&vmcoreinfo_note; - asm volatile ("tpa %0 = %1" : "=r"(paddr) : "r"(vaddr) : "memory"); - return paddr; + return ia64_tpa((unsigned long)(char *)&vmcoreinfo_note); } _