[linux] 09/10: [powerpc] powerpc: add missing includes for rfi_* macro, fix FTBFS

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

corsac pushed a commit to branch stretch
in repository linux.

commit 0388bee2dab782ccb130714a90a311d7a188979b
Author: Yves-Alexis Perez <corsac at corsac.net>
Date:   Fri Feb 16 17:47:37 2018 +0100

    [powerpc] powerpc: add missing includes for rfi_* macro, fix FTBFS
---
 debian/changelog                                   |  1 +
 .../powerpc-add-missing-include-fix-ftbfs.patch    | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f703ef6..0560da1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,6 +58,7 @@ linux (4.9.81-1) UNRELEASED; urgency=medium
     notrepoline because it's __init)
   * [x86] linux-compiler-gcc-6-x86: Add versioned dependency on gcc-6 for
     retpoline support
+  * [powerpc] powerpc: add missing includes for rfi_* macro, fix FTBFS
 
  -- Yves-Alexis Perez <corsac at debian.org>  Tue, 13 Feb 2018 17:44:41 +0100
 
diff --git a/debian/patches/bugfix/powerpc/powerpc-add-missing-include-fix-ftbfs.patch b/debian/patches/bugfix/powerpc/powerpc-add-missing-include-fix-ftbfs.patch
new file mode 100644
index 0000000..62714b0
--- /dev/null
+++ b/debian/patches/bugfix/powerpc/powerpc-add-missing-include-fix-ftbfs.patch
@@ -0,0 +1,37 @@
+From: Yves-Alexis Perez <corsac at debian.org>
+Date: Fri, 16 Feb 2018 17:42:28 +0100
+Subject: powerpc: add missing includes for rfi_* macros
+
+Backported patches for PTI support on powerpc in 4.9 lead to build failure with following output:
+
+ linux-4.9.81/arch/powerpc/kernel/entry_64.S: Assembler messages:
+ linux-4.9.81/arch/powerpc/kernel/entry_64.S:260: Error: unrecognized opcode: `rfi_to_user'
+ linux-4.9.81/arch/powerpc/kernel/entry_64.S:270: Error: unrecognized opcode: `rfi_to_kernel'
+ linux-4.9.81/arch/powerpc/kernel/entry_64.S:885: Error: unrecognized opcode: `rfi_to_user'
+ linux-4.9.81/arch/powerpc/kernel/entry_64.S:900: Error: unrecognized opcode: `rfi_to_kernel'
+ linux-4.9.81/scripts/Makefile.build:398: recipe for target 'arch/powerpc/kernel/entry_64.o' failed
+
+Upstream commit 222f20f140623ef6033491d0103ee0875fe87d35 seems to be missing
+from the 4.9 backport, but it doesn't apply proplery. Until this is properly
+fixed (in 4.9.82 or 4.9.83), just add the missing include.
+
+Signed-off-by: Yves-Alexis Perez <corsac at debian.org>
+---
+
+diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
+index 3320bcac7192..e68faa4d1b13 100644
+--- a/arch/powerpc/kernel/entry_64.S
++++ b/arch/powerpc/kernel/entry_64.S
+@@ -37,6 +37,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.
+
diff --git a/debian/patches/series b/debian/patches/series
index 6697305..0e4526a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -65,6 +65,7 @@ bugfix/x86/platform-x86-ideapad-laptop-add-several-models-to-no.patch
 bugfix/powerpc/powerpc-invalidate-erat-on-powersave-wakeup-for-power9.patch
 bugfix/arm/arm-dts-exynos-add-dwc3-susphy-quirk.patch
 bugfix/mips/mips-remove-pt_regs-adjustments-in-indirect-syscall-.patch
+bugfix/powerpc/powerpc-add-missing-include-fix-ftbfs.patch
 
 # Arch features
 features/mips/MIPS-increase-MAX-PHYSMEM-BITS-on-Loongson-3-only.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git