From patchwork Thu Feb 2 04:42:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 51681 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp37832wrn; Wed, 1 Feb 2023 20:46:25 -0800 (PST) X-Google-Smtp-Source: AK7set+pqhGm8vgMNXpy0aIv6dwMVPS/I36PIgrB4aD5VEJ8wixdWlORIfXF1UrSRbWZb/9LzpNf X-Received: by 2002:a17:90b:33ca:b0:22c:aaaf:8de7 with SMTP id lk10-20020a17090b33ca00b0022caaaf8de7mr5198003pjb.5.1675313185257; Wed, 01 Feb 2023 20:46:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675313185; cv=none; d=google.com; s=arc-20160816; b=VienU+ACqml/V4ihDSRL8mGDbp5+fuusYQAp5jwVeyOSsparNgAAXtOjpawdDKcsv7 31Ockl/aZGXO43kBcp4+v6LLgEumEkH6McYwRXQiAE7EfSEXZqBqy31IUkXGhlRcNq6G WJWo7HgkkjpaC4LQlLvBd12E5g8bV1wPIdhRylPVABwYO1YzBZzeEOm9VMOBYtjSW7yB vrGrGZI1pAOp8MgFQEa2hejYy0l0Poh63DOjI3rizNwkAU9l048H/CZMbY3tjTp3xBbu Ks+WR+yuGZN9N1zg3tFtvXz/QkTb9WuO28QWfbfqcRh+uf38PgXRgIMf3YqryVwMiT+8 lcDQ== 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=dni9tKchHmyX/o1aXsJdUAkZNzgL5FgBO3ptMOjtx0E=; b=eNLGB1Q73SEUTGXnD6tnt0Z1Lo93hFlBWa5uji7gizqFqMgNlNuaRw72pFYW++Tss5 4dWPiu9d/KgMNXOTER/RMvFIAo+hUf1aSjpycV0DBdBK7neo09cVa+ZKrHeuGsk0SUVZ 4YS11JRUybnY5VvRket14CWVFCWNDu4tEkcydUWwLIuhc4lm/9sQfH/tqE4iwr3n1sOy Y/2iO757zvEKRDpmUwSHesmytJougjGViBRUQ+iu+Mm0XAp6Prj1+OA7XfHb5AoeuTsX 91ARkH0OFm5E9WdXRazg438O+DB3YxNZzS2wm3yxQf5+nUuAuHE1fcDDdOr71pbzwpSy X+0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JdqskDXI; 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 130-20020a630188000000b004e22265da03si15754665pgb.652.2023.02.01.20.46.12; Wed, 01 Feb 2023 20:46:25 -0800 (PST) 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=JdqskDXI; 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 S231905AbjBBEpg (ORCPT + 99 others); Wed, 1 Feb 2023 23:45:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231546AbjBBEo0 (ORCPT ); Wed, 1 Feb 2023 23:44:26 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49E257AE6D; Wed, 1 Feb 2023 20:43:53 -0800 (PST) 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 sin.source.kernel.org (Postfix) with ESMTPS id F3931CE2778; Thu, 2 Feb 2023 04:43:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2746EC433AE; Thu, 2 Feb 2023 04:43:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675313031; bh=tQ95HDESaxTuqQzyi1nO4i6CEilM7c7Fe4WNSNWi4kU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JdqskDXIomYSiwz3Z4U2sxQUvmzdaUm1/g9FqeL9OJsA7fRP94ps0hhnABrZ99FaJ p2rFFyeP6TLBIDeB+6KGL8FE60QfgpCTOVXibiz2zwIv8p2eNRK/r7YS8qDOCQPHP1 iPMlor9cjWMoJHaK2wFMZxgf8wZVjV9CpaKjlP6yGIphQp1nh2gGXMw0NrfCPW5Ymo prHIw4OO+uTw0ffAXFtgEMb/JNKiUvbe/F5NYYt8or8Knqhalkqnn7yest5JsHLpTY Q8nZkWxcAUHORHMkpeAWQ0xx7F0FMBT6PBNMrnGWu4yJoli7JyhagYp+oJ+uv0U+i4 /lIZ9kRFMNf8Q== From: Eric Biggers To: stable@vger.kernel.org Cc: Harshit Mogalapalli , Kees Cook , SeongJae Park , Seth Jenkins , Jann Horn , "Eric W . Biederman" , linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org, Tony Luck , Randy Dunlap , Christoph Hellwig , Christoph Hellwig , Andrew Morton , Linus Torvalds Subject: [PATCH 5.4 09/17] ia64: make IA64_MCA_RECOVERY bool instead of tristate Date: Wed, 1 Feb 2023 20:42:47 -0800 Message-Id: <20230202044255.128815-10-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230202044255.128815-1-ebiggers@kernel.org> References: <20230202044255.128815-1-ebiggers@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 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?1756693198522968317?= X-GMAIL-MSGID: =?utf-8?q?1756693198522968317?= From: Randy Dunlap commit dbecf9b8b8ce580f4e11afed9d61e8aa294cddd2 upstream. In linux-next, IA64_MCA_RECOVERY uses the (new) function make_task_dead(), which is not exported for use by modules. Instead of exporting it for one user, convert IA64_MCA_RECOVERY to be a bool Kconfig symbol. In a config file from "kernel test robot " for a different problem, this linker error was exposed when CONFIG_IA64_MCA_RECOVERY=m. Fixes this build error: ERROR: modpost: "make_task_dead" [arch/ia64/kernel/mca_recovery.ko] undefined! Link: https://lkml.kernel.org/r/20220124213129.29306-1-rdunlap@infradead.org Fixes: 0e25498f8cd4 ("exit: Add and use make_task_dead.") Signed-off-by: Randy Dunlap Suggested-by: Christoph Hellwig Reviewed-by: Christoph Hellwig Reviewed-by: "Eric W. Biederman" Cc: Tony Luck Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Eric Biggers --- arch/ia64/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 16714477eef42..6a6036f16abe6 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -360,7 +360,7 @@ config ARCH_PROC_KCORE_TEXT depends on PROC_KCORE config IA64_MCA_RECOVERY - tristate "MCA recovery from errors other than TLB." + bool "MCA recovery from errors other than TLB." config PERFMON bool "Performance monitor support"