Merge tag 'v5.18-rc5' into sched/core to pull in fixes & to resolve a conflict

[sfrench/cifs-2.6.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index a27316f5f737c12faef8d8c6131f71533b227e44..e06cfdaa3c6fe313558780aedf89b54c35f8f1bf 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1443,6 +1443,7 @@ struct task_struct {
        int                             pagefault_disabled;
 #ifdef CONFIG_MMU
        struct task_struct              *oom_reaper_list;
+       struct timer_list               oom_reaper_timer;
 #endif
 #ifdef CONFIG_VMAP_STACK
        struct vm_struct                *stack_vm_area;