From: Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp>
Date: Wed, 17 Oct 2007 06:27:29 +0000 (-0700)
Subject: add-vmcore: use the existing ia64_tpa() instead of asm code
X-Git-Tag: v2.6.24-rc1~665
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00cab92f9e91c0feeaca11a485b15175304779d5;p=linux-2.6

add-vmcore: use the existing ia64_tpa() instead of asm code

Signed-off-by: Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c
index 40f9c3e192..c55a0909b9 100644
--- a/arch/ia64/kernel/machine_kexec.c
+++ b/arch/ia64/kernel/machine_kexec.c
@@ -21,6 +21,7 @@
 #include <asm/setup.h>
 #include <asm/delay.h>
 #include <asm/meminit.h>
+#include <asm/processor.h>
 
 typedef NORET_TYPE void (*relocate_new_kernel_t)(
 					unsigned long indirection_page,
@@ -145,9 +146,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);
 }