From: Greg Kroah-Hartman Date: Sat, 4 Feb 2023 13:59:05 +0000 (+0100) Subject: fix up queue-4.14/exit-add-and-use-make_task_dead.patch X-Git-Tag: v4.14.305~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82f6c7a3dcb14da5bdd57e1fff3b8778557feef3;p=thirdparty%2Fkernel%2Fstable-queue.git fix up queue-4.14/exit-add-and-use-make_task_dead.patch --- diff --git a/queue-4.14/exit-add-and-use-make_task_dead.patch b/queue-4.14/exit-add-and-use-make_task_dead.patch index 527e1a97692..161ebe98a5a 100644 --- a/queue-4.14/exit-add-and-use-make_task_dead.patch +++ b/queue-4.14/exit-add-and-use-make_task_dead.patch @@ -42,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman arch/h8300/kernel/traps.c | 2 +- arch/h8300/mm/fault.c | 2 +- arch/hexagon/kernel/traps.c | 2 +- - arch/ia64/kernel/mca_drv.c | 2 +- + arch/ia64/kernel/mca_drv.c | 3 ++- arch/ia64/kernel/traps.c | 2 +- arch/ia64/mm/fault.c | 2 +- arch/m68k/kernel/traps.c | 2 +- @@ -65,7 +65,7 @@ Signed-off-by: Greg Kroah-Hartman include/linux/sched/task.h | 1 + kernel/exit.c | 9 +++++++++ tools/objtool/check.c | 3 ++- - 32 files changed, 50 insertions(+), 43 deletions(-) + 32 files changed, 51 insertions(+), 43 deletions(-) --- a/arch/alpha/kernel/traps.c +++ b/arch/alpha/kernel/traps.c @@ -186,7 +186,15 @@ Signed-off-by: Greg Kroah-Hartman --- a/arch/ia64/kernel/mca_drv.c +++ b/arch/ia64/kernel/mca_drv.c -@@ -176,7 +176,7 @@ mca_handler_bh(unsigned long paddr, void +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -176,7 +177,7 @@ mca_handler_bh(unsigned long paddr, void spin_unlock(&mca_bh_lock); /* This process is about to be killed itself */