From: Magnus Damm <damm@opensource.se>
Date: Mon, 26 Oct 2009 10:30:48 +0000 (+0000)
Subject: sh: fix kexec by removing check for old kexec-tools
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ef01b9a06d28e37d28f6eb19e60dd78eb1f11639;p=deliverable%2Flinux.git

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>
---

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;
 }