From patchwork Wed Jun 19 18:16:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2751201 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D4C08C0AB1 for ; Wed, 19 Jun 2013 18:21:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EF8122038C for ; Wed, 19 Jun 2013 18:21:31 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D68F3200F4 for ; Wed, 19 Jun 2013 18:21:30 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UpN00-0003ty-CQ; Wed, 19 Jun 2013 18:20:53 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UpMzN-0001fA-UM; Wed, 19 Jun 2013 18:20:13 +0000 Received: from moutng.kundenserver.de ([212.227.17.8]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UpMzL-0001eF-PT for linux-arm-kernel@lists.infradead.org; Wed, 19 Jun 2013 18:20:12 +0000 Received: from klappe2.localnet (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mreu3) with ESMTP (Nemesis) id 0MQYci-1UjlnM0WC4-00TpDH; Wed, 19 Jun 2013 20:16:04 +0200 From: Arnd Bergmann To: Andrew Morton Subject: Re: [PATCH -v11 resend 10/11] arm, change reboot_mode to use enum reboot_mode Date: Wed, 19 Jun 2013 20:16:00 +0200 User-Agent: KMail/1.12.2 (Linux/3.8.0-22-generic; KDE/4.3.2; x86_64; ; ) References: <1370519244-49918-1-git-send-email-holt@sgi.com> <12642293.RmlRtOVM54@wuerfel> <20130619102141.411c8e39.akpm@linux-foundation.org> In-Reply-To: <20130619102141.411c8e39.akpm@linux-foundation.org> MIME-Version: 1.0 Message-Id: <201306192016.00659.arnd@arndb.de> X-Provags-ID: V02:K0:GdJA9uXb1eojTA9qkqwN3355BiDya+O3P5IGv/iPmbF BvPH/krdKA+dtTGeJy3ClOm0F1qeUxahUP+Hw5dvRMLRXd/G0J 7Qnl4z70F7UV+tMisrMbVVnDyiT8ZlMg8795oqvfKe8NULpaJG 2nmKGcFKEVLdfogq+jlK1MkelvutH3ImiwowngM8ZHbd7oOHbM 2eJggopzNzKGH4cEadBE3mgtMOsOJcjutGtCdvN/75/hK/HYRX CRSV0HyDlrav/4XDbC9CV5Vr3zwUZ4nvt5KnioY4xL039UwGJg Z/Kkn0AC8P7MoObUj04Gnw2xp60kMBPHYZ344tUXI4Jm056m3m 8lcaqfoZZ+oWeUet2jps= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130619_142012_098231_2EE67675 X-CRM114-Status: GOOD ( 16.41 ) X-Spam-Score: -1.9 (-) Cc: Russ Anderson , the arch/x86 maintainers , Linux Kernel Mailing List , Robin Holt , "H. Peter Anvin" , Russell King , Guan Xuetao , Arm Mailing List X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Wednesday 19 June 2013, Andrew Morton wrote: > This patchset gets a lot of rejects which I keep on fixing up. Please > merge up early in the merge window and compile-test (and review) the > linux-next changes to make sure I didn't muck up the reject-fixing, > then we should be fine. Ok, good. The patch below is what I used locally to get everything to build. Please fold that into the larger patch. Arnd From cc87f1a209e88d007f93c5c52813d523b753657b Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Wed, 19 Jun 2013 12:54:48 +0200 Subject: [PATCH] ARM: use enum reboot_type on new platforms The interface has changed with "reboot: arm: change reboot_mode to use enum reboot_mode" that is getting merged through the -mm tree. Signed-off-by: Arnd Bergmann diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c index fe4d9ff..7c1bbe2e 100644 --- a/arch/arm/mach-keystone/keystone.c +++ b/arch/arm/mach-keystone/keystone.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -49,7 +50,7 @@ static const char *keystone_match[] __initconst = { NULL, }; -void keystone_restart(char mode, const char *cmd) +void keystone_restart(enum reboot_mode mode, const char *cmd) { u32 val; diff --git a/arch/arm/mach-omap2/omap4-restart.c b/arch/arm/mach-omap2/omap4-restart.c index 652adde..41dfd7d 100644 --- a/arch/arm/mach-omap2/omap4-restart.c +++ b/arch/arm/mach-omap2/omap4-restart.c @@ -8,6 +8,7 @@ */ #include +#include #include "prminst44xx.h" /** diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index ef5b84f..c2c9083 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -92,7 +93,7 @@ static void __init zynq_map_io(void) zynq_scu_map_io(); } -static void zynq_system_reset(char mode, const char *cmd) +static void zynq_system_reset(enum reboot_mode mode, const char *cmd) { zynq_slcr_system_reset(); }