diff options
author | Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> | 2016-08-23 19:57:39 -0300 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-09-06 14:54:08 +1000 |
commit | d81d8258218228d3137055afe8acf981c3ebed46 (patch) | |
tree | 3a99b7e9bcd95ecae02167b6fbdf16e9a1d8a684 /arch | |
parent | 78a3e8889b4b6b99775ed954696ff3e017f5d19b (diff) | |
download | linux-stable-d81d8258218228d3137055afe8acf981c3ebed46.tar.gz linux-stable-d81d8258218228d3137055afe8acf981c3ebed46.tar.bz2 linux-stable-d81d8258218228d3137055afe8acf981c3ebed46.zip |
powerpc/pseries: Fix little endian build with CONFIG_KEXEC=n
On ppc64le, builds with CONFIG_KEXEC=n fail with:
arch/powerpc/platforms/pseries/setup.c: In function ‘pseries_big_endian_exceptions’:
arch/powerpc/platforms/pseries/setup.c:403:13: error: implicit declaration of function ‘kdump_in_progress’
if (rc && !kdump_in_progress())
This is because pseries/setup.c includes <linux/kexec.h>, but
kdump_in_progress() is defined in <asm/kexec.h>. This is a problem
because the former only includes the latter if CONFIG_KEXEC_CORE=y.
Fix it by including <asm/kexec.h> directly, as is done in powernv/setup.c.
Fixes: d3cbff1b5a90 ("powerpc: Put exception configuration in a common place")
Signed-off-by: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 4ffcaa6f8670..a39d20e8623d 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -41,7 +41,6 @@ #include <linux/root_dev.h> #include <linux/of.h> #include <linux/of_pci.h> -#include <linux/kexec.h> #include <asm/mmu.h> #include <asm/processor.h> @@ -66,6 +65,7 @@ #include <asm/eeh.h> #include <asm/reg.h> #include <asm/plpar_wrappers.h> +#include <asm/kexec.h> #include "pseries.h" |