diff options
| author | Matt Fleming <matt@console-pimps.org> | 2009-10-06 23:22:24 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-10-10 14:51:02 +0200 |
| commit | 8bd642b17bea31f8361b61c16c8d154638414df4 (patch) | |
| tree | f501b9cc5c7d129f27a5904086a5cafdbe1b711f /arch/sh/kernel/machine_kexec.c | |
| parent | sh: Allocate PMB entry slot earlier (diff) | |
| download | linux-8bd642b17bea31f8361b61c16c8d154638414df4.tar.xz linux-8bd642b17bea31f8361b61c16c8d154638414df4.zip | |
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) /* older versions of kexec-tools are passing * the zImage entry point as a virtual address. */ - if (image->start != PHYSADDR(image->start)) + if (image->start != __pa(image->start)) return -EINVAL; /* upgrade your kexec-tools */ return 0; |