From patchwork Sat Mar 18 16:13:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 9632261 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8038E601E9 for ; Sat, 18 Mar 2017 16:20:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 69CE3281DB for ; Sat, 18 Mar 2017 16:20:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5D6A628358; Sat, 18 Mar 2017 16:20:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D00842833B for ; Sat, 18 Mar 2017 16:20:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751107AbdCRQUP (ORCPT ); Sat, 18 Mar 2017 12:20:15 -0400 Received: from mout.gmx.net ([212.227.17.21]:57642 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751040AbdCRQUO (ORCPT ); Sat, 18 Mar 2017 12:20:14 -0400 Received: from p100.box ([193.159.23.152]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LzXTy-1cCJTd04n4-014o78; Sat, 18 Mar 2017 17:13:31 +0100 Date: Sat, 18 Mar 2017 17:13:27 +0100 From: Helge Deller To: linux-parisc@vger.kernel.org, James Bottomley , John David Anglin Subject: [PATCH] parisc: Fix system shutdown halting Message-ID: <20170318161327.GA31127@p100.box> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Provags-ID: V03:K0:LqNyAoemc5cQvuBko8DsAApx3++QtXno7pqKPUqJ0qDEeJzXtYk jh380FNWkZtnWG72Usuw3c4VmyjggDYAgm20zNCpcbqwrjlXg1wHYA43KFULLdZYHVruLFI xMqY5SDpFzUcJt4GQaVCQ7SufG+n8J5epfTS58SIyeeNyx2+QGM01qpzh/+WvzL00FJTihV k205STA947N4X8MHfYjFw== X-UI-Out-Filterresults: notjunk:1; V01:K0:jMwSov9kijY=:hVk/VAH7ZArUuTQOB4Z9QV otlgNAeLaOzBQXe358Sh/MBzIXoZ3ahVZv8G5k4FRRSQxgRYRUe8/g7uYMoA/76yu9BKEKfnM WCuyYY2WwpMwslh4chHSJZNljl92X+7a7wXq1gidorCjNZGE9fmijxEt1tdoNNyvIwgONkEDt 5H0nVM+y5duugxr4k2SCzuxFAvRRso75tD640uS6fvDTYsET7wVDmxvtPMT8LsGT8jm4M/DTX Hbjeo9E5G/FwVVqU+u8S5ZPbffVvy+3p8Qh1ndD2sZdgCcfH0/lWs1nPi30oEEPkFy3YX52Ho wRAMIZ0HANmfiY9xm/rtpC3It+EdHojrYXkoAinl+vGtjIQUKcmeACzcqUd6Tdjk6XmCf+uSY Cv/FjTsnn5+JK/4xl8KRto6tduN6fxHZhemki6HUH7NTd8Fwm4WYKZmYkhdLWszFmYcBbWTeA ruurXC/dyny8P5Q5LSyupXmdf59dWe9E+4DaJy0ErPVrpe2he8zmfo9isc0y/wQZSiMaZy0qw wqUehr2DmM3oeP9NPSgKx6tjuLc4bxR5zXmgwQi/dItwvZ9gV57/iKiI0c0rkAMHXOjyVvHP3 iZAxYGz90kDEt6HJCcBqcehDMTHiqmOCYvY7O1NtwKWXMsD81mGRxPPvfEGF3Q57lS9zW55Jw sqSf2z8be6rAkGjOA0KbqkwE6zwnVl8Ts+i+YnkAECLrRrMlAccJwqXIx9q9U0ixosDqbMv9k S1WltgSGNz6irkls/8U0OkDSiVeMbMvm+/qXrYPbYvs90kAc2p5KU4cxB7E= Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On those parisc machines which don't provide a software power off function, the system currently kills the init process at the end of a shutdown and unexpectedly restarts insteads of halting. Fix it by adding a loop which will not return. Signed-off-by: Helge Deller Cc: stable@vger.kernel.org # 4.9+ --- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c index 06f7ca7..b76f503 100644 --- a/arch/parisc/kernel/process.c +++ b/arch/parisc/kernel/process.c @@ -142,6 +142,8 @@ void machine_power_off(void) printk(KERN_EMERG "System shut down completed.\n" "Please power this system off now."); + + for (;;); } void (*pm_power_off)(void) = machine_power_off;