Received: by 2002:a25:d783:0:0:0:0:0 with SMTP id o125csp423951ybg; Thu, 19 Mar 2020 02:14:46 -0700 (PDT) X-Google-Smtp-Source: ADFU+vu6a28LT7dN34IA8goMBDq7voLpoIsP2MR4mBmiQuTfmTacwROK2SxNjub1WNIkNn3vtqBt X-Received: by 2002:a9d:7085:: with SMTP id l5mr1404196otj.53.1584609286261; Thu, 19 Mar 2020 02:14:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584609286; cv=none; d=google.com; s=arc-20160816; b=PGIyrSz3tbFI8RII2kYgga8obe+avxAPADsDZlNQOAu3Zh7jRGpLIEahE+BI30xU5m 2eQDdE+XqXDkJyoMQzN4/lbZMWHOb2+tyqT46OKan9XMunpk1Z/o+IMBOqDe3nN93Shk turyEnsYhcq8SjcdwafonnvsPlXQHz8p0n386KFYU1WsRMxA4v4ohvLlsDmHctQDuy3U faLFs6Yg21P0Nh+BsXOKCqpIakVdItRF8nudCP+1qbsznWL8z/09wFP64CM9vqW50CUK SBrYIDeTcZGQu9yHQGT54I3B+YcmbhF9i2X3y5HB5wHKZ5HxOQsFnL0qR8UQFiIqWSgV R2Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=/irESk8kVsK5ie7MNtxcSuO5DVJxyqAhUOf+rLtjMMk=; b=zWNKyJSqsL6+UJhpOGwsalVpw1T6brzpZDq/ebIMoYNWownQIfYXNM8gXiA9w+lrFL seZ6Rvd9KSyrhHW8grYHoyIVedOr2H/k4ZQdlc6BFN+45W/OFduoayfmxAOys37nPT9I j2fWYLSm3/9AJPXr/mDXnvDRH9vPlgfO8uQxVvE53XXP0m8Q+Dl1/w+ICs6T/B47E0cN 0Ventu2jjVFnJbBq9EWnpYGwToIwn+CNPR7mzs4sziNQtu+h5IXwWOxyggWzljVXuPQU 2nS12R2b9O2uYXbfDHbgPilgia+h9CP0PWHzRUPid5oqtF6mt3rPy6CFlZvFb1Qh7nSO eZIw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h11si975190otj.170.2020.03.19.02.14.34; Thu, 19 Mar 2020 02:14:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725895AbgCSJOK (ORCPT + 99 others); Thu, 19 Mar 2020 05:14:10 -0400 Received: from poy.remlab.net ([94.23.215.26]:55526 "EHLO ns207790.ip-94-23-215.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726936AbgCSJOK (ORCPT ); Thu, 19 Mar 2020 05:14:10 -0400 Received: from basile.remlab.net (ip6-localhost [IPv6:::1]) by ns207790.ip-94-23-215.eu (Postfix) with ESMTP id D7FC85FD2D; Thu, 19 Mar 2020 10:14:07 +0100 (CET) From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= To: catalin.marinas@arm.com, will@kernel.org, linux-arm-kernel@lists.infradead.org Cc: mark.rutland@arm.com, james.morse@arm.com, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] arm64/sdei: gather trampolines' .rodata Date: Thu, 19 Mar 2020 11:14:06 +0200 Message-Id: <20200319091407.51449-2-remi@remlab.net> X-Mailer: git-send-email 2.26.0.rc2 In-Reply-To: <1938400.7m7sAWtiY1@basile.remlab.net> References: <1938400.7m7sAWtiY1@basile.remlab.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rémi Denis-Courmont This gathers the two bits of data together for clarity. Signed-off-by: Rémi Denis-Courmont --- arch/arm64/kernel/entry.S | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 24f828739696..c36733d8cd75 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -862,6 +862,11 @@ SYM_CODE_END(tramp_exit_compat) SYM_DATA_START(__entry_tramp_data_start) .quad vectors SYM_DATA_END(__entry_tramp_data_start) +#ifdef CONFIG_ARM_SDE_INTERFACE +SYM_DATA_START(__sdei_asm_trampoline_next_handler) + .quad __sdei_asm_handler +SYM_DATA_END(__sdei_asm_trampoline_next_handler) +#endif /* CONFIG_ARM_SDE_INTERFACE */ .popsection // .rodata #endif /* CONFIG_RANDOMIZE_BASE */ #endif /* CONFIG_UNMAP_KERNEL_AT_EL0 */ @@ -980,13 +985,6 @@ SYM_CODE_END(__sdei_asm_exit_trampoline) NOKPROBE(__sdei_asm_exit_trampoline) .ltorg .popsection // .entry.tramp.text -#ifdef CONFIG_RANDOMIZE_BASE -.pushsection ".rodata", "a" -SYM_DATA_START(__sdei_asm_trampoline_next_handler) - .quad __sdei_asm_handler -SYM_DATA_END(__sdei_asm_trampoline_next_handler) -.popsection // .rodata -#endif /* CONFIG_RANDOMIZE_BASE */ #endif /* CONFIG_UNMAP_KERNEL_AT_EL0 */ /* -- 2.26.0.rc2