diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-08-31 07:19:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-08-31 07:19:25 +0200 |
| commit | 8f49a2fe8e6bccbd47555048def9cd08da220c74 (patch) | |
| tree | e6ba7f2cc36b03503b6070668ee6720002111ca2 /arch/powerpc/platforms/pseries/ras.c | |
| parent | 04b6ff5f25dece9b0ee244aa768b251cfe855c85 (diff) | |
| parent | f75aef392f869018f78cfedf3c320a6b3fcfda6b (diff) | |
| download | kernel_replicant_linux-8f49a2fe8e6bccbd47555048def9cd08da220c74.tar.gz kernel_replicant_linux-8f49a2fe8e6bccbd47555048def9cd08da220c74.tar.bz2 kernel_replicant_linux-8f49a2fe8e6bccbd47555048def9cd08da220c74.zip | |
Merge 5.9-rc3 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc/platforms/pseries/ras.c')
| -rw-r--r-- | arch/powerpc/platforms/pseries/ras.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c index f3736fcd98fc..13c86a292c6d 100644 --- a/arch/powerpc/platforms/pseries/ras.c +++ b/arch/powerpc/platforms/pseries/ras.c @@ -184,7 +184,6 @@ static void handle_system_shutdown(char event_modifier) case EPOW_SHUTDOWN_ON_UPS: pr_emerg("Loss of system power detected. System is running on" " UPS/battery. Check RTAS error log for details\n"); - orderly_poweroff(true); break; case EPOW_SHUTDOWN_LOSS_OF_CRITICAL_FUNCTIONS: |