diff options
author | 2022-05-22 23:03:29 +0200 | |
---|---|---|
committer | 2022-05-22 23:03:29 +0200 | |
commit | da50aad6d86716aa48a2b8463c85caea77c0355f (patch) | |
tree | c9604cc380e99e613c25ec06cbfcd5009c4575ba /include/linux/sched.h | |
parent | power: supply: bq24190_charger: using pm_runtime_resume_and_get instead of pm_runtime_get_sync (diff) | |
parent | power: supply: ab8500_fg: Allocate wq in probe (diff) | |
download | wireguard-linux-da50aad6d86716aa48a2b8463c85caea77c0355f.tar.xz wireguard-linux-da50aad6d86716aa48a2b8463c85caea77c0355f.zip |
Merge power-supply 'fixes' branch
Merge power-supply fixes, that missed the v5.18 merge window
into power-supply's for-next branch.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index d5e3c00b74e1..a8911b1f35aa 100644 --- 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; |