diff options
| author |   Petr Mladek <pmladek@suse.com> | 2022-06-17 16:36:48 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2022-06-17 16:36:48 +0200 |
| commit | 38335cc5ffafa111210ad6bbe5a63a87db38ee68 (patch) | |
| tree | a317e519b8a46ad7351d23719b34b27b96e4427d /kernel/reboot.c | |
| parent | Merge tag 'printk-for-5.19-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux (diff) | |
| parent | printk: Wait for the global console lock when the system is going down (diff) | |
| download | linux-dev-38335cc5ffafa111210ad6bbe5a63a87db38ee68.tar.xz linux-dev-38335cc5ffafa111210ad6bbe5a63a87db38ee68.zip | |
Merge branch 'rework/kthreads' into for-linus
Diffstat (limited to 'kernel/reboot.c')
| -rw-r--r-- | kernel/reboot.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/reboot.c b/kernel/reboot.c index a091145ee710..b44165b1a399 100644 --- a/kernel/reboot.c +++ b/kernel/reboot.c @@ -82,6 +82,7 @@ void kernel_restart_prepare(char *cmd) { blocking_notifier_call_chain(&reboot_notifier_list, SYS_RESTART, cmd); system_state = SYSTEM_RESTART; + try_block_console_kthreads(10000); usermodehelper_disable(); device_shutdown(); } @@ -270,6 +271,7 @@ static void kernel_shutdown_prepare(enum system_states state) blocking_notifier_call_chain(&reboot_notifier_list, (state == SYSTEM_HALT) ? SYS_HALT : SYS_POWER_OFF, NULL); system_state = state; + try_block_console_kthreads(10000); usermodehelper_disable(); device_shutdown(); } |