| Message ID | 1426260078-20720-1-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | Accepted |
| Commit | 947bb7587fc2c1d1f6b89462ef1255ec30d4e682 |
| Headers | show
Return-Path: <patchwork-forward+bncBDYNJBOFRECBB5UBRSUAKGQER67MXDA@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C0DDA214CB for <linaro@patches.linaro.org>; Fri, 13 Mar 2015 15:23:35 +0000 (UTC) Received: by wggx13 with SMTP id x13sf16966241wgg.0 for <linaro@patches.linaro.org>; Fri, 13 Mar 2015 08:23:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id:cc :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=CcQvIUlFfTcmsnxKUzpmZaGRbP0ga0eT1KFWTu902WA=; b=XbpcBAtw4PoIz5UnF6xwEktHCWZr8EjA2cxZSGOrtF8y20bp9ewPX5NSk4TBFs3B79 61yiYKO6QO24i7o320M3jjXBPFrKCL7AKUNWJSHaZPRWbU9VTLlgAbFnoypJc3DtA1iy luFKpixiwTaMzpcymNRJ62OeTJjJ/p6vaU0ZfzjnskCAIAkL4PLsJW3WHCntL3A7SWC1 pq1qA223nut/sNwCBENLEKbsp2pXhmhjlhH2eP3orqO5vlQGcFIbgDUVXDDfq5ueadMb 4ZrhcFipGqDqpD2FbIuTsdnoUPGoPgluX7SVkBysCa8qTpqOhf52v6xWMwOnYz9pdVB+ knlg== X-Gm-Message-State: ALoCoQkDGafooYPG9bxAW5KKoQYFd+p3ewEIopwJ31kOp6PxplN8/XDfxZn7nPgJAp7vSpoKojT4 X-Received: by 10.112.148.10 with SMTP id to10mr2290289lbb.18.1426260215027; Fri, 13 Mar 2015 08:23:35 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.195 with SMTP id o3ls429130laf.82.gmail; Fri, 13 Mar 2015 08:23:34 -0700 (PDT) X-Received: by 10.112.219.196 with SMTP id pq4mr43946156lbc.104.1426260214685; Fri, 13 Mar 2015 08:23:34 -0700 (PDT) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id i9si1604443lae.58.2015.03.13.08.23.34 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Mar 2015 08:23:34 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by lbjb6 with SMTP id b6so23414534lbj.9 for <patchwork-forward@linaro.org>; Fri, 13 Mar 2015 08:23:34 -0700 (PDT) X-Received: by 10.152.28.5 with SMTP id x5mr43095075lag.112.1426260214554; Fri, 13 Mar 2015 08:23:34 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp986835lbj; Fri, 13 Mar 2015 08:23:33 -0700 (PDT) X-Received: by 10.66.121.161 with SMTP id ll1mr66818032pab.131.1426260212735; Fri, 13 Mar 2015 08:23:32 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id di5si4627804pdb.83.2015.03.13.08.23.31 for <patch@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Mar 2015 08:23:32 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YWRPS-0006JV-8S; Fri, 13 Mar 2015 15:21:58 +0000 Received: from mail-we0-f176.google.com ([74.125.82.176]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YWRPL-00065d-Vt for linux-arm-kernel@lists.infradead.org; Fri, 13 Mar 2015 15:21:52 +0000 Received: by wevk48 with SMTP id k48so24009896wev.5 for <linux-arm-kernel@lists.infradead.org>; Fri, 13 Mar 2015 08:21:30 -0700 (PDT) X-Received: by 10.180.86.201 with SMTP id r9mr141436115wiz.56.1426260089855; Fri, 13 Mar 2015 08:21:29 -0700 (PDT) Received: from ards-macbook-pro.local ([84.78.24.16]) by mx.google.com with ESMTPSA id dz6sm3258071wib.0.2015.03.13.08.21.25 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Mar 2015 08:21:27 -0700 (PDT) From: Ard Biesheuvel <ard.biesheuvel@linaro.org> To: marc.zyngier@arm.com, catalin.marinas@arm.com, will.deacon@arm.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm64: put __boot_cpu_mode label after alignment instead of before Date: Fri, 13 Mar 2015 16:21:18 +0100 Message-Id: <1426260078-20720-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150313_082152_231817_21742B00 X-CRM114-Status: UNSURE ( 7.62 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.176 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [74.125.82.176 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: <patchwork-forward.linaro.org> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ard.biesheuvel@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 |
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 3e300bfb0089..9c856f2aa7a5 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -557,8 +557,8 @@ ENDPROC(set_cpu_boot_mode_flag) * zeroing of .bss would clobber it. */ .pushsection .data..cacheline_aligned -ENTRY(__boot_cpu_mode) .align L1_CACHE_SHIFT +ENTRY(__boot_cpu_mode) .long BOOT_CPU_MODE_EL2 .long 0 .popsection
Another one for the big head.S spring cleaning: the label should be after the .align or it may point to the padding. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- arch/arm64/kernel/head.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)