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: 109491 Delivered-To: patch@linaro.org Received: by 10.140.101.6 with SMTP id t6csp991794qge; Sat, 5 Aug 2017 13:53:36 -0700 (PDT) X-Received: by 10.84.174.129 with SMTP id r1mr7777818plb.55.1501966416594; Sat, 05 Aug 2017 13:53:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501966416; cv=none; d=google.com; s=arc-20160816; b=HVM7OZnu4oO1z5bJVDvqdWRhNulHxHq0Gc75Re2Xg55j8+yMmpjiDOcQbqbJNkJu08 1QCDCG7uQoE1K0JJxFq9XqHhlUsMBOozEyH7ggjX40+apvxwXgV99rtENELe7uJOL0dL 7p63u6mkpTArQz8ptYK1Lo4ZMfWRH6NOhW6H/+t2IDci4sLHhw26rIUETsOFyrndt8lX syYbWeie4310FVkUGF7LmgDZH1wnKLpEV9ZuunPegfpkxd+6e4iWo3gEt01Vjvv90oqN ++rgvUPHmd9kKV8J7jKYfu4SgfJCxy3X3FJ/M7cieBIKaOG3extTVR0GYfIqTwYp1LHs DxPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=Mcjh3vn1DyheoD8D7Zu4T71Gpnl1NsP4r2GjSseyDjk=; b=kK17qPFsqciPfWrr/KwkKdDqrxYU++miK8hMMwjei4bMBSjYjyvt+bVV1dJbWLsIEu bVtfqaT1as/VM15gjeqd8NaCgMFyoyZFsvbATQNH052Bs1E3TkxC0UMvcwsun8QL3pO4 TAtqkBS7cujwxjjxveoB8KD1Pr/Sc4npJMNg1WMaI1iFu9LWEdKaX/KS7S/9zUYj8rgE HnXZgO/NDi0e8uwnZ/hALllawekic6bg0yeVuuVI2H4VhO7R0ty3EHbZSQuUhEHGAPYa +Mdxlk7mU2C6JNt+dlWPJV+ZJ10k/Oq+9UoiutvdThI5jSTx9bHf0Dby4LMmU0VDcyhe 31aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=Iw4uFNpm; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e6si3018685plk.487.2017.08.05.13.53.36; Sat, 05 Aug 2017 13:53:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=Iw4uFNpm; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752595AbdHEUx3 (ORCPT + 3 others); Sat, 5 Aug 2017 16:53:29 -0400 Received: from mail-wr0-f178.google.com ([209.85.128.178]:34063 "EHLO mail-wr0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752724AbdHEUxZ (ORCPT ); Sat, 5 Aug 2017 16:53:25 -0400 Received: by mail-wr0-f178.google.com with SMTP id 12so27172080wrb.1 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=c9/Ibp1APze7Q8CBsmjQNws/ikSP2Ep3JVIKd7yB3T51jjl6BxhuTBJO3ntyaIsjAr qszrcREUAL3VOix/kAFNYKj7YkKkxLrq20e06uzUP3EmmffGvgCWCdwbuuIDrmgBfM5d Yis7ClAlcGjCMosWernwzIbPoh+HsXVjt4v1MNVL7Z3Jd1+KFdoOWBXTUhNYdA7n5dkD 9mh0Ir1zuhmfsuvN6PRk64yEUXeOJtJc15jNeKpd7st/nKs1Uj3YoQObyoArVUDtV5vQ EiuzAkv8EZKQfTff7up1saN08RlOgCQj60U1OXABEZAgOgZ4xHDbv8Tsr4L6cGgheYd4 TX9g== X-Gm-Message-State: AIVw113G/v1tPL6xowBZ1s1XR3pUSlje0S6iEloEYZRF7ozzLIyKY62L R3LtMXOIJXxRTS1R 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: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org 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(-) -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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: