From patchwork Sat Aug 5 20:52:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 9883323 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CDFBB60392 for ; Sat, 5 Aug 2017 20:53:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFF3E286CC for ; Sat, 5 Aug 2017 20:53:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B4A37287B9; Sat, 5 Aug 2017 20:53:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49C46286CC for ; Sat, 5 Aug 2017 20:53:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752730AbdHEUxa (ORCPT ); Sat, 5 Aug 2017 16:53:30 -0400 Received: from mail-wr0-f171.google.com ([209.85.128.171]:38159 "EHLO mail-wr0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752719AbdHEUxZ (ORCPT ); Sat, 5 Aug 2017 16:53:25 -0400 Received: by mail-wr0-f171.google.com with SMTP id f21so27115947wrf.5 for ; Sat, 05 Aug 2017 13:53:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=k5onxlKK/PyKFt2gLNbOxILCedirmVtcEqPLhb8Y8Jw=; b=Iw4uFNpmhbXRl8jk5SHo2Y4CWc5kaNS94D/VEa377l/N7M6wdKogbv4T/rHbqeqeIM U6oM4sogUegUFIFNKg/78Y4vnFEBWrtBsLadm19iryL+F+3EtICY67+1EVx6t2C10CLH omupH9h/VxxZ0DEXMzg2y5b2rTYRZhHh97vAY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=k5onxlKK/PyKFt2gLNbOxILCedirmVtcEqPLhb8Y8Jw=; b=D8jkmIaC8K3GGIDiJeFP3sNtVH7fBLFrlXaV4k47fwf/VQ4rrOBiHQRgxFx0Z1T/sl YWEc46Ez7Tha7SMhvwZGvl9Owh0VaQWEambJE9x/iQOAatVu/LvRmd7S7NH09wSpw+QU XR3JzpdylhFACpElaQ+gPok4HNJdMBDg94gM0bkMDOikOemKNTO4sq+b5fSnPf8a6J/n eF7Q9TwbU1f/sto/yQrTHBeSEjTchv8qNUMw8uKkutfYTZIHfYc2nDzqjiSpnGF6FSvF liLK6jY/tW1Ykcqf2l1qQgZik1LYdr1fpyud9nCgHBjWcZD1gBRdSqrqT+h5sFCiDin6 wtiQ== X-Gm-Message-State: AIVw112Ohf0gZqpRI4bEXZSVaxXv/AmxNXCoJ/xEoL34u5UDiZN/owNc Duon0EViAbi9Rgdw X-Received: by 10.223.136.28 with SMTP id d28mr5361978wrd.217.1501966403910; Sat, 05 Aug 2017 13:53:23 -0700 (PDT) Received: from localhost.localdomain ([160.77.147.147]) by smtp.gmail.com with ESMTPSA id v62sm2601775wmd.2.2017.08.05.13.53.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Aug 2017 13:53:23 -0700 (PDT) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, linux-renesas-soc@vger.kernel.org, linux@armlinux.org.uk, linux-omap@vger.kernel.org, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, krzk@kernel.org, jason@lakedaemon.net, arm@kernel.org, andrew@lunn.ch, gregory.clement@free-electrons.com, sebastian.hesselbarth@gmail.com, tony@atomide.com, baohua@kernel.org, horms@verge.net.au, magnus.damm@gmail.com, vireshk@kernel.org, shiraz.linux.kernel@gmail.com, patrice.chotard@st.com, nico@linaro.org, dave.martin@arm.com, marc.zyngier@arm.com Cc: Ard Biesheuvel Subject: [PATCH 05/15] ARM: head: use PC-relative insn sequence for __smp_alt Date: Sat, 5 Aug 2017 21:52:12 +0100 Message-Id: <20170805205222.19868-6-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170805205222.19868-1-ard.biesheuvel@linaro.org> References: <20170805205222.19868-1-ard.biesheuvel@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Replace the open coded PC relative offset calculations with a pair of adr_l invocations. Signed-off-by: Ard Biesheuvel --- arch/arm/kernel/head.S | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 6e9df3663a57..aed341e0f530 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -523,19 +523,11 @@ ARM_BE8(rev r0, r0) @ byteswap if big endian retne lr __fixup_smp_on_up: - adr r0, 1f - ldmia r0, {r3 - r5} - sub r3, r0, r3 - add r4, r4, r3 - add r5, r5, r3 + adr_l r4, __smpalt_begin + adr_l r5, __smpalt_end b __do_fixup_smp_on_up ENDPROC(__fixup_smp) - .align -1: .word . - .word __smpalt_begin - .word __smpalt_end - .pushsection .data .globl smp_on_up smp_on_up: