From patchwork Mon Jun 10 22:11:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 2699311 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id 1CF45DF264 for ; Mon, 10 Jun 2013 22:11:48 +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 1UmAJW-0006RT-5i; Mon, 10 Jun 2013 22:11:46 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UmAJT-0005JV-IK; Mon, 10 Jun 2013 22:11:43 +0000 Received: from mail.linuxfoundation.org ([140.211.169.12]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UmAJQ-0005J2-FD for linux-arm-kernel@lists.infradead.org; Mon, 10 Jun 2013 22:11:41 +0000 Received: from akpm3.mtv.corp.google.com (unknown [216.239.45.95]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 7CF4B6F3; Mon, 10 Jun 2013 22:11:18 +0000 (UTC) Date: Mon, 10 Jun 2013 15:11:12 -0700 From: Andrew Morton To: Robin Holt Subject: Re: [PATCH -v11 resend 10/11] arm, change reboot_mode to use enum reboot_mode Message-Id: <20130610151112.26c71baa4127ed931d913215@linux-foundation.org> In-Reply-To: <1370519244-49918-11-git-send-email-holt@sgi.com> References: <1370519244-49918-1-git-send-email-holt@sgi.com> <1370519244-49918-11-git-send-email-holt@sgi.com> X-Mailer: Sylpheed 3.2.0beta5 (GTK+ 2.24.10; x86_64-pc-linux-gnu) Mime-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130610_181140_562404_BAF0C389 X-CRM114-Status: GOOD ( 16.39 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Russ Anderson , the arch/x86 maintainers , Linux Kernel Mailing List , "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 On Thu, 6 Jun 2013 06:47:23 -0500 Robin Holt wrote: > Preparing to move the parsing of reboot= to generic kernel code > forces the change in reboot_mode handling to use the enum. > > ... > > 125 files changed, 282 insertions(+), 166 deletions(-) That's a big patch. The potential for ARM breakage is high. I spotted one glitch: From: Andrew Morton Subject: arm-change-reboot_mode-to-use-enum-reboot_mode-fix fix arch/arm/mach-socfpga/socfpga.c Cc: Guan Xuetao Cc: H. Peter Anvin Cc: Robin Holt Cc: Russ Anderson Cc: Russell King Signed-off-by: Andrew Morton --- arch/arm/mach-socfpga/socfpga.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN arch/arm/mach-socfpga/socfpga.c~arm-change-reboot_mode-to-use-enum-reboot_mode-fix arch/arm/mach-socfpga/socfpga.c --- a/arch/arm/mach-socfpga/socfpga.c~arm-change-reboot_mode-to-use-enum-reboot_mode-fix +++ a/arch/arm/mach-socfpga/socfpga.c @@ -97,7 +97,7 @@ static void socfpga_cyclone5_restart(enu temp = readl(rst_manager_base_addr + SOCFPGA_RSTMGR_CTRL); - if (mode == 'h') + if (mode == REBOOT_HARD) temp |= RSTMGR_CTRL_SWCOLDRSTREQ; else temp |= RSTMGR_CTRL_SWWARMRSTREQ;