diff options
| author |   Magnus Damm <damm@opensource.se> | 2009-10-26 10:30:48 +0000 |
|---|---|---|
| committer |   Paul Mundt <lethal@linux-sh.org> | 2009-10-26 19:45:45 +0900 |
| commit | ef01b9a06d28e37d28f6eb19e60dd78eb1f11639 (patch) | |
| tree | 004d398ed4c2cebc1d5094aa26c6ec7be1be6d2a /arch/sh/kernel/machine_kexec.c | |
| parent | Merge branch 'sh/stable-updates' (diff) | |
| download | linux-dev-ef01b9a06d28e37d28f6eb19e60dd78eb1f11639.tar.xz linux-dev-ef01b9a06d28e37d28f6eb19e60dd78eb1f11639.zip | |
sh: fix kexec by removing check for old kexec-tools
This unbreaks kexec support. Without this fix all
cases of kexec fails since __pa() does not behave
like PHYSADDR(). The downside is that we also kill
the code blocking users running old kexec-tools.
Signed-off-by: Magnus Damm <damm@opensource.se>
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 | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/sh/kernel/machine_kexec.c b/arch/sh/kernel/machine_kexec.c index de7cf5477d3f..76f280223ebd 100644 --- a/arch/sh/kernel/machine_kexec.c +++ b/arch/sh/kernel/machine_kexec.c @@ -46,12 +46,6 @@ void machine_crash_shutdown(struct pt_regs *regs) */ 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 != __pa(image->start)) - return -EINVAL; /* upgrade your kexec-tools */ - return 0; } |