From: Greg Kroah-Hartman Date: Sat, 17 Feb 2018 13:45:38 +0000 (+0100) Subject: 4.9-stable patches X-Git-Tag: v4.15.5~54 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=62ac8d4fcf5d947a5bebf738545f3dec86f42777;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: powerpc-64s-simple-rfi-macro-conversions.patch --- diff --git a/queue-4.9/powerpc-64s-simple-rfi-macro-conversions.patch b/queue-4.9/powerpc-64s-simple-rfi-macro-conversions.patch new file mode 100644 index 00000000000..fd08dcd26d5 --- /dev/null +++ b/queue-4.9/powerpc-64s-simple-rfi-macro-conversions.patch @@ -0,0 +1,40 @@ +From 222f20f140623ef6033491d0103ee0875fe87d35 Mon Sep 17 00:00:00 2001 +From: Nicholas Piggin +Date: Wed, 10 Jan 2018 03:07:15 +1100 +Subject: powerpc/64s: Simple RFI macro conversions + +From: Nicholas Piggin + +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 +Signed-off-by: Michael Ellerman +Cc: Yves-Alexis Perez +Signed-off-by: Greg Kroah-Hartman + +--- + 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 + #include + #include ++#ifdef CONFIG_PPC_BOOK3S ++#include ++#else ++#include ++#endif + + /* + * System calls. diff --git a/queue-4.9/series b/queue-4.9/series index a816348d297..9096468d195 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -1 +1,2 @@ scsi-smartpqi-allow-static-build-built-in.patch +powerpc-64s-simple-rfi-macro-conversions.patch