]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix up queue-4.14/exit-add-and-use-make_task_dead.patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 4 Feb 2023 13:59:05 +0000 (14:59 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 4 Feb 2023 13:59:05 +0000 (14:59 +0100)
queue-4.14/exit-add-and-use-make_task_dead.patch

index 527e1a9769207d975b5deba18aec6eee55b90487..161ebe98a5a81fef9e17ed6bd7ea6b4c39447546 100644 (file)
@@ -42,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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          |    +-
+ 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 <gregkh@linuxfoundation.org>
  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 <gregkh@linuxfoundation.org>
  
 --- 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 <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
        spin_unlock(&mca_bh_lock);
  
        /* This process is about to be killed itself */