From patchwork Tue Oct 24 13:26:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= X-Patchwork-Id: 157475 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1945530vqx; Tue, 24 Oct 2023 06:34:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHBOvvzeD1RXzhvtqCKUdxr8K7SlvcMwrBa+uIr9HNWk8Zru6ivnbMh+YTWAtsw6xQ045G9 X-Received: by 2002:a05:6358:1804:b0:168:ea0e:e7e2 with SMTP id u4-20020a056358180400b00168ea0ee7e2mr3841927rwm.4.1698154499408; Tue, 24 Oct 2023 06:34:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698154499; cv=none; d=google.com; s=arc-20160816; b=dv5rJeqiP5AbKSUAPN69AGm6TPDReUB6NfsxVuo69jZ+0CnagWLytxdzEblkcnz6yo sumpIBivgNI2E9F/km/KCmJ4kbPYPcKelUyl5quDKuR6XRGdkbxVcZ/TZySBLHS+iecu S9J75iOhGkHlGSO92WruC8GltKzh7EZw0ZGg0l9uUqLplWR+txx2DPwV+sOq7ptdnWIM RcbV1G1MdD0qAXabCD0RbXBy9Gd+g0RE7m9uKvoV5tzwPA7qoordZj3ISeaNeZtOVj2q PY7Zfc6QA0X3OUlUOqNRdDf4tQ5FNOJyB6o0PGPotCBJkqgXkdBVZ9zpfY0FuYDLhOFV JLng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=JzJW8mbLnPSn6J2V5LPD0tHMd0DjHcRVmnBobw7QLdA=; fh=Rc5BA83UGq8xI+benUSDUMXSpsH6SOD8MT9gG1locMQ=; b=Tcu0vorb55ZTzyDXLwoOR1ebve+SpgJiaQvLWFssPkLi+LO9xFGh4IQ35DKGgXzY8b PHYF/8/5uf0lAfh8YQ2oKOMvdaJoVAgrrufZbejHkaW6Ia6pnrrLClKSN5axpBTcecqN 7EF5nw1jxD89kF2HBinhlLtq9EfyXmrvlQrRdyS3nbQ4fHOWfFdAwh4BxFVBL8qE0u3N P4Y+uDREx8bnzUkhOr6Eu50q/VLB85ngm0XBt3VUEXqA0cWDYGPBWHobDWggFQUIzgKp 25EAsMh3mGtSgnB+x/UGF4Y2kPWoVpX0dmfEnlMGldQLjU505IW95uX383sw/rTNf6Ub jUBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=kfUuov92; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id f22-20020a633816000000b005b5df8bf695si8567804pga.328.2023.10.24.06.34.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 06:34:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=kfUuov92; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 5DA96802C8E5; Tue, 24 Oct 2023 06:34:58 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234604AbjJXNey (ORCPT + 26 others); Tue, 24 Oct 2023 09:34:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234575AbjJXNer (ORCPT ); Tue, 24 Oct 2023 09:34:47 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0EA166A7A for ; Tue, 24 Oct 2023 06:27:56 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-32da42b8225so920781f8f.0 for ; Tue, 24 Oct 2023 06:27:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1698154074; x=1698758874; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JzJW8mbLnPSn6J2V5LPD0tHMd0DjHcRVmnBobw7QLdA=; b=kfUuov924bX+nrLrP99Now6Jt4E8SxBVArsWKIkP6wV3PXv/CRCQ/1O5fQAgn0MR45 t+N1OfyxRV0RO+UYlbZGWvvaD1OMQv50iZ2FiLsoldp7chcXFrNc7ck/fwEyRE9vBIjI dyJqxo0TbTdcFvpR95FdjTdgLKaGVj3ESQD+U/MTM1NqPzSKstlqr6lk42wpZbPuGzK6 CElg8PIP0DBL5kdiK6XJgMPnv5z5ECBeyeIu9u+A0uoQjkqk63HcIMSY3DeH8J0vcA3Q 2qmPyB/Ue7hDuh4Z4yFpOBHUKotr65sLHUTkE1AwxFdMSLX7pt1Ja/L+51Jxq6sjZwRq FEtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698154074; x=1698758874; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JzJW8mbLnPSn6J2V5LPD0tHMd0DjHcRVmnBobw7QLdA=; b=iK26GPtqaiqIavExr1FoH0QnBXIeVOnAn9MIMBLMjKkdAu/IifiR8j8Yn/yVXn1ZQs 4YJSyohSNg9X5TC4rYX5AoHQCbZPCtKnmt9Gjud9Mkx+nEk3jSwN8aGC0AsHdum1DEji D5HhQ1U8qhw39M5GHUNRBGF/symnIO/+f0SqemtCJrUofsdUvMUKe0am13tAvFHD4Dsz DzdVqJ6n3oOf614kY9UQ6DcNWxoLxz1phsIkP4XIvUu7D85NdcIsXjQiN2fOGaR+TmqA qy9GPy8p26ZVY15r3ILIjwJROBZw31Sh61QF0vB4bRRI3UOQgj1fcyfq7iBEP0bvrM0+ Lp5Q== X-Gm-Message-State: AOJu0YxDa7HO9KbcHJfKy8yjU/El7a/PxzmoF37PSTRsbvd48HzPJDMw kdfnoWbsea819/nHADFB/gFhHA== X-Received: by 2002:adf:a455:0:b0:32d:d8ed:d6e0 with SMTP id e21-20020adfa455000000b0032dd8edd6e0mr7575871wra.0.1698154074488; Tue, 24 Oct 2023 06:27:54 -0700 (PDT) Received: from carbon-x1.. ([2a01:e0a:999:a3a0:597d:e2c5:6741:bac9]) by smtp.gmail.com with ESMTPSA id c17-20020a5d4151000000b0032d87b13240sm10034964wrq.73.2023.10.24.06.27.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 06:27:53 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Atish Patra , Andrew Jones Cc: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH v2 3/5] riscv: kernel: Use correct SYM_DATA_*() macro for data Date: Tue, 24 Oct 2023 15:26:53 +0200 Message-ID: <20231024132655.730417-4-cleger@rivosinc.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231024132655.730417-1-cleger@rivosinc.com> References: <20231024132655.730417-1-cleger@rivosinc.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 24 Oct 2023 06:34:58 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780644052090509613 X-GMAIL-MSGID: 1780644052090509613 Some data were incorrectly annotated with SYM_FUNC_*() instead of SYM_DATA_*() ones. Use the correct ones. Signed-off-by: Clément Léger Reviewed-by: Andrew Jones --- arch/riscv/kernel/entry.S | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S index 64ac0dd6176b..a7aa2fd599d6 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -324,7 +324,7 @@ SYM_FUNC_END(__switch_to) .section ".rodata" .align LGREG /* Exception vector table */ -SYM_CODE_START(excp_vect_table) +SYM_DATA_START_LOCAL(excp_vect_table) RISCV_PTR do_trap_insn_misaligned ALT_INSN_FAULT(RISCV_PTR do_trap_insn_fault) RISCV_PTR do_trap_insn_illegal @@ -342,12 +342,11 @@ SYM_CODE_START(excp_vect_table) RISCV_PTR do_page_fault /* load page fault */ RISCV_PTR do_trap_unknown RISCV_PTR do_page_fault /* store page fault */ -excp_vect_table_end: -SYM_CODE_END(excp_vect_table) +SYM_DATA_END_LABEL(excp_vect_table, SYM_L_LOCAL, excp_vect_table_end) #ifndef CONFIG_MMU -SYM_CODE_START(__user_rt_sigreturn) +SYM_DATA_START(__user_rt_sigreturn) li a7, __NR_rt_sigreturn ecall -SYM_CODE_END(__user_rt_sigreturn) +SYM_DATA_END(__user_rt_sigreturn) #endif