Re: [PATCH 4.9 34/77] powerpc: fix build errors in stable tree

[Michael Ellerman]

Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> writes:

> 4.9-stable review patch.  If anyone has any objections, please let me know.
>
> ------------------
>
> From: Nicholas Piggin <npiggin@xxxxxxxxx>
>
> This is just the first chunk of commit
> 222f20f140623ef6033491d0103ee0875fe87d35 upstream.

That should have been back ported in full?

Oh I see now Greg took my 4.4 series and applied it to 4.9 but this one
didn't apply.

So I guess this patch is OK for now, but we do need a full back port of
222f20f to 4.9.

cheers


> to fix a build error in the powerpc tree due to other backports
> happening (and this full patch not being backported).
>
> Reported-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> Reported-by: Yves-Alexis Perez <corsac@xxxxxxxxxx>
> Cc: Nicholas Piggin <npiggin@xxxxxxxxx>
> Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
> Cc: Yves-Alexis Perez <corsac@xxxxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
>
> ---
>  arch/powerpc/kernel/entry_64.S |    5 +++++
>  1 file changed, 5 insertions(+)
>
> --- a/arch/powerpc/kernel/entry_64.S
> +++ b/arch/powerpc/kernel/entry_64.S
> @@ -39,6 +39,11 @@
>  #include <asm/tm.h>
>  #include <asm/ppc-opcode.h>
>  #include <asm/export.h>
> +#ifdef CONFIG_PPC_BOOK3S
> +#include <asm/exception-64s.h>
> +#else
> +#include <asm/exception-64e.h>
> +#endif
>  
>  /*
>   * System calls.