diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-22 06:43:17 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-22 06:43:17 -0400 |
| commit | bf3c0e5e7102f5787d693379d9d384b813fe890b (patch) | |
| tree | aa48fc57dee9ecdf99918affa38d1b06be41419a /arch/powerpc/platforms/pseries/ras.c | |
| parent | 32251b07d532174d66941488c112ec046f646157 (diff) | |
| parent | 976bc5e2aceedef13e0ba1f0e6e372a22164aa0c (diff) | |
| download | kernel_replicant_linux-bf3c0e5e7102f5787d693379d9d384b813fe890b.tar.gz kernel_replicant_linux-bf3c0e5e7102f5787d693379d9d384b813fe890b.tar.bz2 kernel_replicant_linux-bf3c0e5e7102f5787d693379d9d384b813fe890b.zip | |
Merge branch 'x86-seves-for-paolo' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into HEAD
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: |