[linux] 01/02: switch to upstream version of the ppc rfi macros patch

[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 06a4c0237129cabb28c73ca42e95c1e21dadb85a
Author: Yves-Alexis Perez <corsac at corsac.net>
Date:   Sat Feb 17 14:49:12 2018 +0100

    switch to upstream version of the ppc rfi macros patch
---
 debian/changelog                                   |  2 +-
 .../powerpc-64s-simple-rfi-macro-conversions.patch | 40 ++++++++++++++++++++++
 .../powerpc-add-missing-include-fix-ftbfs.patch    | 37 --------------------
 3 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e712ac9..b58fa7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,7 +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
+  * [powerpc] powerpc/64s: Simple RFI macro conversions (fix FTBFS)
   * [powerpc] Ignore ABI change in paca, introduced in 4.9.81
 
  -- Yves-Alexis Perez <corsac at debian.org>  Tue, 13 Feb 2018 17:44:41 +0100
diff --git a/debian/patches/bugfix/powerpc/powerpc-64s-simple-rfi-macro-conversions.patch b/debian/patches/bugfix/powerpc/powerpc-64s-simple-rfi-macro-conversions.patch
new file mode 100644
index 0000000..fd08dcd
--- /dev/null
+++ b/debian/patches/bugfix/powerpc/powerpc-64s-simple-rfi-macro-conversions.patch
@@ -0,0 +1,40 @@
+From 222f20f140623ef6033491d0103ee0875fe87d35 Mon Sep 17 00:00:00 2001
+From: Nicholas Piggin <npiggin at gmail.com>
+Date: Wed, 10 Jan 2018 03:07:15 +1100
+Subject: powerpc/64s: Simple RFI macro conversions
+
+From: Nicholas Piggin <npiggin at gmail.com>
+
+commit 222f20f140623ef6033491d0103ee0875fe87d35 upstream.
+
+[just the top part of this commit, to fix a 4.9.y build error - gregkh]
+
+This commit does simple conversions of rfi/rfid to the new macros that
+include the expected destination context. By simple we mean cases
+where there is a single well known destination context, and it's
+simply a matter of substituting the instruction for the appropriate
+macro.
+
+Signed-off-by: Nicholas Piggin <npiggin at gmail.com>
+Signed-off-by: Michael Ellerman <mpe at ellerman.id.au>
+Cc: Yves-Alexis Perez <corsac at debian.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh at 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.
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
deleted file mode 100644
index 62714b0..0000000
--- a/debian/patches/bugfix/powerpc/powerpc-add-missing-include-fix-ftbfs.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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.
-

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