| From 222f20f140623ef6033491d0103ee0875fe87d35 Mon Sep 17 00:00:00 2001 |
| From: Nicholas Piggin <npiggin@gmail.com> |
| Date: Wed, 10 Jan 2018 03:07:15 +1100 |
| Subject: powerpc: fix build errors in stable tree |
| |
| From: Nicholas Piggin <npiggin@gmail.com> |
| |
| This is just the first chunk of commit |
| 222f20f140623ef6033491d0103ee0875fe87d35 upstream. |
| |
| 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@roeck-us.net> |
| Reported-by: Yves-Alexis Perez <corsac@debian.org> |
| Cc: Nicholas Piggin <npiggin@gmail.com> |
| Cc: Michael Ellerman <mpe@ellerman.id.au> |
| Cc: Yves-Alexis Perez <corsac@debian.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| 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. |
