diff options
author | Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp> | 2007-10-17 02:27:29 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 11:42:54 -0400 |
commit | 00cab92f9e91c0feeaca11a485b15175304779d5 (patch) | |
tree | 8603b957791f52f3ab0bc02350ff486ae9056cde /arch/ia64/kernel/machine_kexec.c | |
parent | 6cfa062f01b601206b980e503f62dc593ed8fcaa (diff) |
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>
Diffstat (limited to 'arch/ia64/kernel/machine_kexec.c')
-rw-r--r-- | arch/ia64/kernel/machine_kexec.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c index 40f9c3e19220..c55a0909b901 100644 --- a/arch/ia64/kernel/machine_kexec.c +++ b/arch/ia64/kernel/machine_kexec.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <asm/setup.h> | 21 | #include <asm/setup.h> |
22 | #include <asm/delay.h> | 22 | #include <asm/delay.h> |
23 | #include <asm/meminit.h> | 23 | #include <asm/meminit.h> |
24 | #include <asm/processor.h> | ||
24 | 25 | ||
25 | typedef NORET_TYPE void (*relocate_new_kernel_t)( | 26 | typedef NORET_TYPE void (*relocate_new_kernel_t)( |
26 | unsigned long indirection_page, | 27 | unsigned long indirection_page, |
@@ -145,9 +146,6 @@ void arch_crash_save_vmcoreinfo(void) | |||
145 | 146 | ||
146 | unsigned long paddr_vmcoreinfo_note(void) | 147 | unsigned long paddr_vmcoreinfo_note(void) |
147 | { | 148 | { |
148 | unsigned long vaddr, paddr; | 149 | return ia64_tpa((unsigned long)(char *)&vmcoreinfo_note); |
149 | vaddr = (unsigned long)(char *)&vmcoreinfo_note; | ||
150 | asm volatile ("tpa %0 = %1" : "=r"(paddr) : "r"(vaddr) : "memory"); | ||
151 | return paddr; | ||
152 | } | 150 | } |
153 | 151 | ||