Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1428354AbdDXR7Q (ORCPT ); Mon, 24 Apr 2017 13:59:16 -0400 Received: from foss.arm.com ([217.140.101.70]:60072 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1428324AbdDXR66 (ORCPT ); Mon, 24 Apr 2017 13:58:58 -0400 From: Julien Grall To: xen-devel@lists.xen.org Cc: sstabellini@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, mark.rutland@arm.com, linux-efi@vger.kernel.org, Julien Grall Subject: [PATCH 2/3 v2] arm/xen: Consolidate calls to shutdown hypercall in a single helper Date: Mon, 24 Apr 2017 18:58:38 +0100 Message-Id: <20170424175839.5262-3-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170424175839.5262-1-julien.grall@arm.com> References: <20170424175839.5262-1-julien.grall@arm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1133 Lines: 46 Signed-off-by: Julien Grall --- Changes in v2: - Patch added --- arch/arm/xen/enlighten.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 81e3217b12d3..ba7f4c8f5c3e 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -191,20 +191,24 @@ static int xen_dying_cpu(unsigned int cpu) return 0; } -static void xen_restart(enum reboot_mode reboot_mode, const char *cmd) +void xen_reboot(int reason) { - struct sched_shutdown r = { .reason = SHUTDOWN_reboot }; + struct sched_shutdown r = { .reason = reason }; int rc; + rc = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r); BUG_ON(rc); } +static void xen_restart(enum reboot_mode reboot_mode, const char *cmd) +{ + xen_reboot(SHUTDOWN_reboot); +} + + static void xen_power_off(void) { - struct sched_shutdown r = { .reason = SHUTDOWN_poweroff }; - int rc; - rc = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r); - BUG_ON(rc); + xen_reboot(SHUTDOWN_poweroff); } static irqreturn_t xen_arm_callback(int irq, void *arg) -- 2.11.0