From patchwork Thu Jun 27 21:39:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 2795841 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 BBE71BF4A1 for ; Thu, 27 Jun 2013 21:40:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E268D2025A for ; Thu, 27 Jun 2013 21:40:21 +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 D135C20253 for ; Thu, 27 Jun 2013 21:40:20 +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 1UsJvM-0006Go-8G; Thu, 27 Jun 2013 21:40:16 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UsJvJ-0004EZ-PM; Thu, 27 Jun 2013 21:40:13 +0000 Received: from mail-wi0-f169.google.com ([209.85.212.169]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UsJvG-0004Dd-8r for linux-arm-kernel@lists.infradead.org; Thu, 27 Jun 2013 21:40:10 +0000 Received: by mail-wi0-f169.google.com with SMTP id c10so1076100wiw.4 for ; Thu, 27 Jun 2013 14:39:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:x-gm-message-state; bh=bsndlMWyHCc56SLMTsScwvjxQf34r9mHmKd2ojaH1UQ=; b=CYtKcJtw+a/SCAq1oCslfbZ2oK/CRiQKN2qodaZ1rTbqBfEsObTnEfWO3aRDIgAgtN sfHuqEKKorZT9iAnywVblB6ODS1DOsCZXrHlExTzHxlVAjViSKgkoX/GnfllsUxUzAXH qxec5obhzzVA6yO5Ijmsdg2veVSUvsIgui1jv8YbRu5lnlLtqlU8LRFS/Mofly5AatVe p77JbyWuurNbjFTtNHNkQMgOKLVgjlGsA7LI0mkg12cNnVe1xwpfm6SNFdrovuTUCahi 9iRLPiIQ6owO78AW6aiQ6qyowNMBW0LX15VoVPlIO7uONAJJO43ReBSLzeMZvrnaiyyk 3dKA== MIME-Version: 1.0 X-Received: by 10.194.58.239 with SMTP id u15mr7561012wjq.87.1372369188183; Thu, 27 Jun 2013 14:39:48 -0700 (PDT) Received: by 10.180.14.227 with HTTP; Thu, 27 Jun 2013 14:39:48 -0700 (PDT) In-Reply-To: References: <1370519244-49918-1-git-send-email-holt@sgi.com> <12642293.RmlRtOVM54@wuerfel> <20130619102141.411c8e39.akpm@linux-foundation.org> <201306192016.00659.arnd@arndb.de> Date: Thu, 27 Jun 2013 14:39:48 -0700 Message-ID: Subject: Re: [PATCH -v11 resend 10/11] arm, change reboot_mode to use enum reboot_mode From: Kevin Hilman To: Arnd Bergmann X-Gm-Message-State: ALoCoQmJHzOmRFgQ3G6WAQ9Rxs42Ks/Vl7YYPU0xvfAlKZMy5c9upvjtCX5vIY3qbbyUG8oflg5Q X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130627_174010_413528_48A75FB0 X-CRM114-Status: GOOD ( 18.17 ) X-Spam-Score: -2.6 (--) Cc: Russ Anderson , the arch/x86 maintainers , Linux Kernel Mailing List , Robin Holt , "H. Peter Anvin" , Russell King , Andrew Morton , 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 Thu, Jun 27, 2013 at 2:28 PM, Kevin Hilman wrote: > On Tue, Jun 25, 2013 at 2:41 PM, Kevin Hilman wrote: >> On Wed, Jun 19, 2013 at 11:16 AM, Arnd Bergmann wrote: >>> 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. >> >> I'm still seeing build breaks in linux-next due to the original patch. >> >> Will the fix below from Arnd be folded into the original? > > Actually, there's even more ARM build fallout from this patch not > covered by Arnd's fix. For example, building the ixp4xx_defconfig now > has an include nesting mess[1] that is not a trivial fixup (at least > that I have found yet). > > IMO, this patch needs to be dropped from -next until it gets better > build coverage testing on ARM. OK, the change below also needs to be folded in to fix ixp4xxx_defconfig on ARM. Kevin diff --git a/arch/arm/mach-ixp4xx/include/mach/platform.h b/arch/arm/mach-ixp4xx/include/mach/platform.h index 4c4c6a6..8f81a5b 100644 --- a/arch/arm/mach-ixp4xx/include/mach/platform.h +++ b/arch/arm/mach-ixp4xx/include/mach/platform.h @@ -13,7 +13,7 @@ #ifndef __ASSEMBLY__ -#include +extern enum reboot_mode reboot_mode; #include