From: Sasha Levin <sashal@kernel.org>
Date: Sat, 4 Feb 2023 13:48:00 +0000 (-0500)
Subject: Fix up queue-5.4/exit-add-and-use-make_task_dead.patch
X-Git-Tag: v4.14.305~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=311b8aa30c6ac9b804284e3d8c1e4e610ab39729;p=thirdparty%2Fkernel%2Fstable-queue.git

Fix up queue-5.4/exit-add-and-use-make_task_dead.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-5.4/exit-add-and-use-make_task_dead.patch b/queue-5.4/exit-add-and-use-make_task_dead.patch
index 184fbc88c72..bd85b1b5beb 100644
--- a/queue-5.4/exit-add-and-use-make_task_dead.patch
+++ b/queue-5.4/exit-add-and-use-make_task_dead.patch
@@ -1,4 +1,4 @@
-From 522a1673d1ea0c4c148c11486f3ba9c40456b8b3 Mon Sep 17 00:00:00 2001
+From 0c3ee33d8ce48972fbfc9fe14b3a9dbb1dda310c Mon Sep 17 00:00:00 2001
 From: Sasha Levin <sashal@kernel.org>
 Date: Wed, 1 Feb 2023 20:42:42 -0800
 Subject: exit: Add and use make_task_dead.
@@ -41,7 +41,7 @@ Signed-off-by: Sasha Levin <sashal@kernel.org>
  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 +-
@@ -68,7 +68,7 @@ Signed-off-by: Sasha Levin <sashal@kernel.org>
  include/linux/sched/task.h          | 1 +
  kernel/exit.c                       | 9 +++++++++
  tools/objtool/check.c               | 3 ++-
- 38 files changed, 59 insertions(+), 52 deletions(-)
+ 38 files changed, 60 insertions(+), 52 deletions(-)
 
 diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c
 index f6b9664ac504..f87d8e1fcfe4 100644
@@ -232,10 +232,18 @@ index 69c623b14ddd..bfd04a388bca 100644
  }
  
 diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c
-index 2a40268c3d49..d9ee3b186249 100644
+index 2a40268c3d49..c8a87798618e 100644
 --- 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 *iip, unsigned long ipsr)
+@@ -12,6 +12,7 @@
+ #include <linux/types.h>
+ #include <linux/init.h>
+ #include <linux/sched.h>
++#include <linux/sched/task.h>
+ #include <linux/interrupt.h>
+ #include <linux/irq.h>
+ #include <linux/kallsyms.h>
+@@ -176,7 +177,7 @@ mca_handler_bh(unsigned long paddr, void *iip, unsigned long ipsr)
  	spin_unlock(&mca_bh_lock);
  
  	/* This process is about to be killed itself */