| Message ID | 1471993059-19239-1-git-send-email-bauerman@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, 2016-23-08 at 22:57:39 UTC, Thiago Jung Bauermann wrote: > 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’ [-Werror=implicit-function-declaration] > 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 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> Applied to powerpc fixes, thanks. https://git.kernel.org/powerpc/c/d81d8258218228d3137055afe8 cheers
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"
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’ [-Werror=implicit-function-declaration] 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 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> --- arch/powerpc/platforms/pseries/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)