From patchwork Thu May 11 14:12:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 92664 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp4429497vqo; Thu, 11 May 2023 07:44:46 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4k6/mcPL6Kf2Wfr8MMInfOJOcCk/l+qfxipqKxpY/JZpJ78CnM/+Q8ZJ5C4W8jPau/wOlG X-Received: by 2002:a05:6a20:748a:b0:f0:fa9b:d4c7 with SMTP id p10-20020a056a20748a00b000f0fa9bd4c7mr28882293pzd.55.1683816286430; Thu, 11 May 2023 07:44:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683816286; cv=none; d=google.com; s=arc-20160816; b=pmH2HUEumIs3sEC/0UnKDf+racRtoeA0TAoL+3psNINxdfr//q9ZA43bM9F92ABh1W SRxCD9mn/EV9d1xGSwWn72Irjyn3oyKiggebHKA+EDiulsrcbFHgtV6YE5twF6fmTa11 3k1cLTp3Cj89dTVnDgEKhV/Dh22VJZnH7NKLyTDIOCSLuJccyDZ8L4Wzi2DiB21CyqC0 fYqsYb+N9/S8rK/mlbjqn+VkHGbqx9e8zXrpKltbohFKw2ZwvFDe2xGcJdDYh0PAYEkm 5HHtcoXmWwPTxMbe/yFszgrTGE+w324TxidgH4iujfGvZFLeNfFlLaVDDI4YV3GNjAc1 exgQ== 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=KQLkrzwE28w39a6wsJfGHr8VTTBSiVuuIFiMskHqSL0=; b=oOH8ocYJU60Y3GOQkK2olEE9N1IsZboOCqD41C4JMYrGF/QScTQc0+EBLHFGmwWuXN 8jQKJXPV+QK8PjfzBksgcHh8xOqAEj3GlpmwJd5WinhXW9QjtN1fl/LjVXenEaiPF5NO ZYoPjRc6hcypO2ZM3EUXg1KYZpTWwVrWubwsBw5rthuOufLNxi+o2ACbxFJ+OV7rs16l CPfbjpOKY0RwrvGsUuV9lFGfM3PlUuq2KjmTwG+aXdMHtDW89YraXSq2ndHc5qRG/MDV iXMpsk40VJdgG0VJMiQWrQLuZp42Or0HdlhjUK6lM+8G2QAD21ohPacSaMQJgBJSwm4f RaTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uXb2rCTo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g67-20020a636b46000000b005030006a2desi6414965pgc.182.2023.05.11.07.44.34; Thu, 11 May 2023 07:44:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uXb2rCTo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238388AbjEKOXy (ORCPT + 99 others); Thu, 11 May 2023 10:23:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238130AbjEKOXh (ORCPT ); Thu, 11 May 2023 10:23:37 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FB45E49; Thu, 11 May 2023 07:23:25 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E8E1F64DFB; Thu, 11 May 2023 14:23:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DCFA2C433EF; Thu, 11 May 2023 14:23:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683815002; bh=Qsoh2DY7RYTsIMpTH0GDqs55ax7692t2wbeau6VO2qk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uXb2rCTojbnqqTn8P5YlUMw1+SbNkb9+0LGdTYGVAsGB5VW7NiYN9ojgrezU7ny/I /4/MfKa1ZkIhiwP4Pxwvia4Fb44hFJFum1axBzCT0AunQRiQJYmqbeHky99hKG3Y4y hnlCgZd4yJo767E4hiQTcj2oSoQZWYDf4edI6H05y3e8Axa8JuV6dUrNTeQFkv/82C WFc2+SUJR7u6hIGjtwp9qNR+SpzY6xENyrESHr4WgLFQdLbO+yqP06u2gCFY0fWZZD EvQeqAUKXv2u3eUDWLZl+kZdcJYBvi+BLAY6Rch79ST0BeLCol71cqzKsN5l2GhPpX WYB2MfCiS68NQ== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Arnd Bergmann Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Subject: [PATCH 2/4] riscv: move HAVE_RETHOOK to keep entries sorted Date: Thu, 11 May 2023 22:12:09 +0800 Message-Id: <20230511141211.2418-3-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230511141211.2418-1-jszhang@kernel.org> References: <20230511141211.2418-1-jszhang@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765609346247466918?= X-GMAIL-MSGID: =?utf-8?q?1765609346247466918?= Commit b57c2f124098 ("riscv: add riscv rethook implementation") selects the HAVE_RETHOOK option for the first time in riscv, but it breaks the entries order. Properly move its location to keep entries sorted. Signed-off-by: Jisheng Zhang Reviewed-by: Conor Dooley --- arch/riscv/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 348c0fa1fc8c..f0663b52d052 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -110,7 +110,6 @@ config RISCV select HAVE_KPROBES if !XIP_KERNEL select HAVE_KPROBES_ON_FTRACE if !XIP_KERNEL select HAVE_KRETPROBES if !XIP_KERNEL - select HAVE_RETHOOK if !XIP_KERNEL select HAVE_MOVE_PMD select HAVE_MOVE_PUD select HAVE_PCI @@ -119,6 +118,7 @@ config RISCV select HAVE_PERF_USER_STACK_DUMP select HAVE_POSIX_CPU_TIMERS_TASK_WORK select HAVE_REGS_AND_STACK_ACCESS_API + select HAVE_RETHOOK if !XIP_KERNEL select HAVE_RSEQ select HAVE_STACKPROTECTOR select HAVE_SYSCALL_TRACEPOINTS