From patchwork Sat Oct 22 07:19:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 7464 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1098869wrr; Sat, 22 Oct 2022 01:12:01 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7F2n6hWgogd0HNdWjoGuv5NeOoX1nGbvfOl7axMkOKoGdbIMpkTeymomZw9ugZwc+z08vR X-Received: by 2002:a17:902:ce90:b0:185:47af:a0d3 with SMTP id f16-20020a170902ce9000b0018547afa0d3mr23110194plg.153.1666426321674; Sat, 22 Oct 2022 01:12:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666426321; cv=none; d=google.com; s=arc-20160816; b=Z5u7vjXaVmb/JODeRg0wM83cZn1k9a6o4+m6eKhdJx2X7oEr4ekjHxgjrgSt2G/shL TSFcSgMHddh0HFPR7wlQT7G9+N6WItsWuaBxEkwRxHymz2T9aSDNWk0rDkt8cDgvQPZf iNhTzF+Qvth8yN2MLLRZ4wer2NoUkaWsSDV7dahfDhYldDOIwdsOHc8hpmYHM5ml2hcr 1Gw7VxPg0dMSn9s0sseSLrsEVSC30jw+dnORCPc98hrGHyaHqqTLliquj7Lge9tlBeb9 yUcpki1Vk6gD0wr+tP732grrXW3oL3JNG1nCrkUHU5PAbieaC7Pxlbepx8jaUKwzU1zw hPDw== 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=GoCuuyGtLRGZPqurKoQQxnv0qLk7XlNt5TJvVDGSY80=; b=isTrbL+NQEUVI+soxVjkRtHJlIajZFx332/1h8oxCnCEIhchNaSPBVREQSzc1i+x/k uWFHiMP93eBNVcc1B2dXdMuncGYem2VdFlgaAfEDK5yLyGsMKWAxTMwRDTTX8pDCyfbZ +aKMdtqOARRlVE1Q4zSSWWYXKI4rhDGo0bbY8145XjpBooBIXaPFWmG7wEb/fP5bOnW3 e97wF8ebtzAPQ6wdabQZSLCSUPy40dXSUe4VEFD6/W5Ue1Q7ou+NZrdcTmJfpuNl8FkK GsWWjPL/Z7nFJz8Is540GxpKKOYXo13iUvi9LyWMc9qGJJyw9M5EuEbTIiHIas6Ow+YP xPWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=0ZGe8hYv; 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 c10-20020a63ea0a000000b00438b79bcf26si28222164pgi.151.2022.10.22.01.11.48; Sat, 22 Oct 2022 01:12:01 -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=0ZGe8hYv; 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 S233267AbiJVILK (ORCPT + 99 others); Sat, 22 Oct 2022 04:11:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232870AbiJVII2 (ORCPT ); Sat, 22 Oct 2022 04:08:28 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA3C92C6EB2; Sat, 22 Oct 2022 00:53:36 -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 3B26A60AF8; Sat, 22 Oct 2022 07:38:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4107BC433D6; Sat, 22 Oct 2022 07:38:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666424291; bh=tbVGBnUCnP64Ww9zk4cCKvbF8v6NfhXrIq0FiPXcUcQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0ZGe8hYvaUAwQZZ304SIKYwMjDkghNwVIAG9hMryET0iSV2lUzsd1bU5TVYsAKQCf d5i/Rbcfm9r14Amtv93z2wTxrauduuyJIZ6ZfTMnBcDvurGlk6O0P/ZurFISuUraP9 858EaS7qV0TIxonfagjGrKjqc40SSNcwSnuvX2uU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe Leroy , Michael Ellerman Subject: [PATCH 5.19 091/717] powerpc/Kconfig: Fix non existing CONFIG_PPC_FSL_BOOKE Date: Sat, 22 Oct 2022 09:19:30 +0200 Message-Id: <20221022072431.484486070@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 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?1747374646701007746?= X-GMAIL-MSGID: =?utf-8?q?1747374646701007746?= 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 @@ -817,7 +817,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