From: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Date: Thu, 30 Jan 2014 19:00:45 +0000 (+0530)
Subject: powerpc/pseries: Disable relocation on exception while going down during crash.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3ec8b78fcc5aa7745026d8d85a4e9ab52c922765;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

powerpc/pseries: Disable relocation on exception while going down during crash.

Disable relocation on exception while going down even in kdump case. This
is because we are about clear htab mappings while kexec-ing into kdump
kernel and we may run into issues if we still have AIL ON.

Signed-off-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 8e639d7cbda7..972df0ffd4dc 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -430,8 +430,7 @@ static void pSeries_machine_kexec(struct kimage *image)
 {
 	long rc;
 
-	if (firmware_has_feature(FW_FEATURE_SET_MODE) &&
-	    (image->type != KEXEC_TYPE_CRASH)) {
+	if (firmware_has_feature(FW_FEATURE_SET_MODE)) {
 		rc = pSeries_disable_reloc_on_exc();
 		if (rc != H_SUCCESS)
 			pr_warning("Warning: Failed to disable relocation on "