diff options
author | Matt Fleming <matt@console-pimps.org> | 2009-10-06 17:22:24 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-10-10 08:51:02 -0400 |
commit | 8bd642b17bea31f8361b61c16c8d154638414df4 (patch) | |
tree | f501b9cc5c7d129f27a5904086a5cafdbe1b711f /arch/sh/kernel/machine_kexec.c | |
parent | 067784f6239e08a084b4d8d597e14435331eae51 (diff) |
sh: Obliterate the P1 area macros
Replace the use of PHYSADDR() with __pa(). PHYSADDR() is based on the
idea that all addresses in P1SEG are untranslated, so we can access an
address's physical page as an offset from P1SEG. This doesn't work for
CONFIG_PMB/CONFIG_PMB_FIXED because pages in P1SEG and P2SEG are used
for PMB mappings and so can be translated to any physical address.
Likewise, replace a P1SEGADDR() use with virt_to_phys().
Signed-off-by: Matt Fleming <matt@console-pimps.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/machine_kexec.c')
-rw-r--r-- | arch/sh/kernel/machine_kexec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/machine_kexec.c b/arch/sh/kernel/machine_kexec.c index 7ea2704ea033..de7cf5477d3f 100644 --- a/arch/sh/kernel/machine_kexec.c +++ b/arch/sh/kernel/machine_kexec.c | |||
@@ -49,7 +49,7 @@ int machine_kexec_prepare(struct kimage *image) | |||
49 | /* older versions of kexec-tools are passing | 49 | /* older versions of kexec-tools are passing |
50 | * the zImage entry point as a virtual address. | 50 | * the zImage entry point as a virtual address. |
51 | */ | 51 | */ |
52 | if (image->start != PHYSADDR(image->start)) | 52 | if (image->start != __pa(image->start)) |
53 | return -EINVAL; /* upgrade your kexec-tools */ | 53 | return -EINVAL; /* upgrade your kexec-tools */ |
54 | 54 | ||
55 | return 0; | 55 | return 0; |