From: Greg Kroah-Hartman Date: Tue, 4 Dec 2018 13:39:23 +0000 (+0100) Subject: fix up 4.14 x86 patch X-Git-Tag: v4.19.7~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8bba4e0ece7cc7a53812bd9d57298287fd3df05;p=thirdparty%2Fkernel%2Fstable-queue.git fix up 4.14 x86 patch --- diff --git a/queue-4.14/x86process_Consolidate_and_simplify_switch_to_xtra_code.patch b/queue-4.14/x86process_Consolidate_and_simplify_switch_to_xtra_code.patch index dd503cfe8ee..ab042e2423b 100644 --- a/queue-4.14/x86process_Consolidate_and_simplify_switch_to_xtra_code.patch +++ b/queue-4.14/x86process_Consolidate_and_simplify_switch_to_xtra_code.patch @@ -44,9 +44,9 @@ Signed-off-by: Greg Kroah-Hartman arch/x86/include/asm/switch_to.h | 3 --- arch/x86/kernel/process.c | 12 +++++++----- arch/x86/kernel/process.h | 24 ++++++++++++++++++++++++ - arch/x86/kernel/process_32.c | 8 +------- + arch/x86/kernel/process_32.c | 10 +++------- arch/x86/kernel/process_64.c | 10 +++------- - 5 files changed, 35 insertions(+), 22 deletions(-) + 5 files changed, 37 insertions(+), 22 deletions(-) --- a/arch/x86/include/asm/switch_to.h +++ b/arch/x86/include/asm/switch_to.h @@ -134,7 +134,16 @@ Signed-off-by: Greg Kroah-Hartman +} --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c -@@ -234,7 +234,6 @@ __switch_to(struct task_struct *prev_p, +@@ -59,6 +59,8 @@ + #include + #include + ++#include "process.h" ++ + void __show_regs(struct pt_regs *regs, int all) + { + unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L; +@@ -234,7 +236,6 @@ __switch_to(struct task_struct *prev_p, struct fpu *prev_fpu = &prev->fpu; struct fpu *next_fpu = &next->fpu; int cpu = smp_processor_id(); @@ -142,7 +151,7 @@ Signed-off-by: Greg Kroah-Hartman /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */ -@@ -266,12 +265,7 @@ __switch_to(struct task_struct *prev_p, +@@ -266,12 +267,7 @@ __switch_to(struct task_struct *prev_p, if (get_kernel_rpl() && unlikely(prev->iopl != next->iopl)) set_iopl_mask(next->iopl);