diff options
author | David S. Miller <davem@davemloft.net> | 2015-01-06 22:29:20 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-01-06 22:29:20 -0500 |
commit | 44d84d7272e5848878a96029b8a8b6e86854f146 (patch) | |
tree | 91b188c0ae21255510ace7507d42cdf0e8f6f5ae /arch/powerpc/platforms/pseries/lpar.c | |
parent | de7b5b3d790a2524c3f992d357983600635c441b (diff) | |
parent | bdec41963890f8ed9ad89f8b418959ab3cdc2aa3 (diff) | |
download | linux-44d84d7272e5848878a96029b8a8b6e86854f146.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/powerpc/platforms/pseries/lpar.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/lpar.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c index 469751d92004..b5682fd6c984 100644 --- a/arch/powerpc/platforms/pseries/lpar.c +++ b/arch/powerpc/platforms/pseries/lpar.c @@ -43,6 +43,7 @@ #include <asm/trace.h> #include <asm/firmware.h> #include <asm/plpar_wrappers.h> +#include <asm/kexec.h> #include <asm/fadump.h> #include "pseries.h" @@ -267,8 +268,13 @@ static void pSeries_lpar_hptab_clear(void) * out to the user, but at least this will stop us from * continuing on further and creating an even more * difficult to debug situation. + * + * There is a known problem when kdump'ing, if cpus are offline + * the above call will fail. Rather than panicking again, keep + * going and hope the kdump kernel is also little endian, which + * it usually is. */ - if (rc) + if (rc && !kdump_in_progress()) panic("Could not enable big endian exceptions"); } #endif |