diff options
| author | Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com> | 2014-02-18 20:39:40 +1100 |
|---|---|---|
| committer | Wang Sen <wangsen@linux.vnet.ibm.com> | 2014-02-19 16:36:19 +0800 |
| commit | 33c964c0421cb048ba9f197e6e233c84e1346e8e (patch) | |
| tree | 0d83310240b5ab0018a65cbec4bf5e174a0fd851 | |
| parent | f828c7322e1e42f979e66acd7590f1819fd0398f (diff) | |
| download | powerkvm-33c964c0421cb048ba9f197e6e233c84e1346e8e.tar.gz | |
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.
This is at least part of the fix for kdump failures that we are seeing
in bug 103693.
Signed-off-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
(cherry picked from commit 3ec8b78fcc5aa7745026d8d85a4e9ab52c922765)
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index f56c912b69f1bd..d80825564176bc 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 " |