From patchwork Wed Oct 19 08:23:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 5223 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp265553wrs; Wed, 19 Oct 2022 04:22:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM77armrZp/OsZm8pGNIUQxDkZkg4nSSqP/wjELKRDLgQaJ0ypHWEIObXsMWWaVmongcA6o5 X-Received: by 2002:a17:90b:4f46:b0:20d:1fe8:dcd2 with SMTP id pj6-20020a17090b4f4600b0020d1fe8dcd2mr44614244pjb.235.1666178560992; Wed, 19 Oct 2022 04:22:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666178560; cv=none; d=google.com; s=arc-20160816; b=aodUiAtZD1ee7Ve5nHobO6BNqVr1unE+R2d523W565XkrtlVyXJunjUZAoamGQK/ve J2j8XaiMbIqFa+m/rJhsc159BJzc36SOnZ41wAynAeVOJq5P7b2dQiXkbOzGuBy3InA+ S0E8P4zoppVMSiJrS82pszmf2vQ9Tgytlmf1iAX+VFyME9BpfeEPdE4WLsByIkMV42bg MNQTSgEvSx00p4i2DMmW3TzTzI8uMvvm5uYWVg8bDnmsljkqWKMqAAN6DNHchmBeR0s/ 4HwgO2CzhVq580A2rQBNg+6IUi5XPfvRvd92xU0/gb4dsHwvAqx38ucmBKZm0BVAZbW8 czzw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Ih2faZnCL84xy0HONy9gmM7WQomB5NBGlY+NWM02VAg=; b=NkgpMJAwL34pJ4TYSD+9aAD/scpMY4fh9z4OX/1ha48d+ywbEpbjfYd9oDN0rho3xA J7Vpo90sHE/bpG2St9+B5WUP0VcHZDTYCSzVM/anxu2zhgxbv090eE3D/ufl/6QY6OT5 9XsoG1MI7oQBCTZf+ar6X+pQt9FU2Un4Y0eTR1eIVWIwr8xn4qW66SiMpU+zFPVkjDeJ /AZ8+snsPEIVGsarJGOKU1gEpGZE9GWtgG4i9tnt5F4pjR0XhpCdTYXfGBfjGt9G4i34 UVl87KRBxcN6wX98Ha33qWAzlpsOQm1riAa/ZepAoR6W5/DGDgka7nLgbW+rECD8dOs1 m1Qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=oEP68VBm; 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=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f1-20020a637541000000b0045a2b6e23b6si18560809pgn.290.2022.10.19.04.22.28; Wed, 19 Oct 2022 04:22:40 -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=@linuxfoundation.org header.s=korg header.b=oEP68VBm; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232120AbiJSLL1 (ORCPT + 99 others); Wed, 19 Oct 2022 07:11:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230090AbiJSLKr (ORCPT ); Wed, 19 Oct 2022 07:10:47 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44A1517D856; Wed, 19 Oct 2022 03:38:16 -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 ams.source.kernel.org (Postfix) with ESMTPS id E5DDCB822E4; Wed, 19 Oct 2022 08:42:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1EBF9C433D6; Wed, 19 Oct 2022 08:42:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666168935; bh=/vyTLvtjXMq73ygQ+QM9aR5+/yBlM03oiribJFWms2s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oEP68VBmXxn90Zqfav4zafjkq1kmTSd2pb39aXXVqa+JGeiK/TA2/aNNNc37LCc5R YORJw0D7/FIik9gsHwy/oBfaZaulYt4gGqTkLD2WiCFBRzfqlnh8dHFy0GWzRpwIm6 SQpGKumCsNPLwSMh53ipuGQXTKvIrUl8lcyHtZ/g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe Leroy , Michael Ellerman Subject: [PATCH 6.0 102/862] powerpc/Kconfig: Fix non existing CONFIG_PPC_FSL_BOOKE Date: Wed, 19 Oct 2022 10:23:09 +0200 Message-Id: <20221019083254.415369614@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 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?1747114850297914079?= X-GMAIL-MSGID: =?utf-8?q?1747114850297914079?= From: Christophe Leroy commit d1203f32d86987a3ccd7de9ba2448ba12d86d125 upstream. CONFIG_PPC_FSL_BOOKE doesn't exist. Should be CONFIG_FSL_BOOKE. Fixes: 49e3d8ea6248 ("powerpc/fsl_booke: Enable STRICT_KERNEL_RWX") Cc: stable@vger.kernel.org Signed-off-by: Christophe Leroy Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/828f6a64eeb51ce9abfa1d4e84c521a02fecebb8.1663606875.git.christophe.leroy@csgroup.eu Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -828,7 +828,7 @@ config DATA_SHIFT default 24 if STRICT_KERNEL_RWX && PPC64 range 17 28 if (STRICT_KERNEL_RWX || DEBUG_PAGEALLOC || KFENCE) && PPC_BOOK3S_32 range 19 23 if (STRICT_KERNEL_RWX || DEBUG_PAGEALLOC || KFENCE) && PPC_8xx - range 20 24 if (STRICT_KERNEL_RWX || DEBUG_PAGEALLOC || KFENCE) && PPC_FSL_BOOKE + range 20 24 if (STRICT_KERNEL_RWX || DEBUG_PAGEALLOC || KFENCE) && FSL_BOOKE default 22 if STRICT_KERNEL_RWX && PPC_BOOK3S_32 default 18 if (DEBUG_PAGEALLOC || KFENCE) && PPC_BOOK3S_32 default 23 if STRICT_KERNEL_RWX && PPC_8xx