diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-08-31 07:11:45 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-08-31 07:11:45 +0200 |
| commit | 5fedf0d295d3ef69fd85fdee4cb68fd3756b54c2 (patch) | |
| tree | 777c39ad4586149de154be3c4c102f751336a37b /arch/x86/kernel/reboot.c | |
| parent | 3ed8e1c2ac9914a2fcb08ec13476b85319536cea (diff) | |
| parent | f75aef392f869018f78cfedf3c320a6b3fcfda6b (diff) | |
Merge 5.9-rc3 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/kernel/reboot.c')
| -rw-r--r-- | arch/x86/kernel/reboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 0ec7ced727fe..a515e2d230b7 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -654,7 +654,7 @@ static void native_machine_emergency_restart(void) case BOOT_CF9_FORCE: port_cf9_safe = true; - /* Fall through */ + fallthrough; case BOOT_CF9_SAFE: if (port_cf9_safe) { |