Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp423618imu; Sat, 17 Nov 2018 02:26:34 -0800 (PST) X-Google-Smtp-Source: AJdET5fEeimoXNd865ELgMyqTKbilPPxvVVkGCR56rSsZHuqiL+9ChrEtSg7PmrnIzdr3BMUf8hW X-Received: by 2002:a62:7f94:: with SMTP id a142mr14927320pfd.96.1542450394929; Sat, 17 Nov 2018 02:26:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542450394; cv=none; d=google.com; s=arc-20160816; b=k7qUwIFjgBurlmJngKKZG7Z5HbLrG65b6a3Xdc0FtwhMqdvf8l44fmxLgtp6mAYCiu SBekEzg3KyqQwAn9gZbFSw0nj8fDF6ta0O/3NDeMHewIL/B9MCdC6jS6E3rzowQrSro3 yo8dr/TCihiSV1j1FrNBYVH3FCREtAAYS7SnlHW8h4VS/VVP337AbYH9lULggAfAjwCN 3763swnqKulPuyXr0yz43uYbYzW9kIM6a/B9/OJk8SpLJNy9Wz14EZbFeLMBiTieu87n btjaJsPQu7Tezq7o7C7RKyeteNnCQFxL5KgGygxxQSqcYyePT4MI1m312478tIsynBtz f4Kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id; bh=rKwsOVc7pYkcseGu0lx6RjBl7tRiHoJTLfAx+T023FU=; b=HjRIIeyizn++mjz3cXgVyswI5Y8wV43lck2GX78Pn6mZ10B5lC3abqxQCfv+mu1ENc JDu8MlErUiYI8Z1cLlnym8QT2wJbEk9QQqYfFeDT+EHa9w6I/2xjSFDHGNsuybaqqSWo l3Eoc8lQ346UutLMf/0sPWTIP1phkIPPg0ynnmpXJ5PFaLrw3SBCBUsuekh8D93AKCbD yGdePSCia5FvzzgwdwLTrRYY693wpKm/UxKZBnYTkVZi2p9JXdwAP9PSvqoRuIwNE8iR RzcctDO/X3nP3OpnBa/y6QGn/3wUwQtJNYYx+H5SOliVKnhesRivofvYtv7RPlOMYbyx wPlg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q3-v6si39738655pli.10.2018.11.17.02.26.02; Sat, 17 Nov 2018 02:26:34 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726590AbeKQUlW (ORCPT + 99 others); Sat, 17 Nov 2018 15:41:22 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:18178 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726338AbeKQUlV (ORCPT ); Sat, 17 Nov 2018 15:41:21 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 42xrnr2p5nz9v0hl; Sat, 17 Nov 2018 11:25:04 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id oFUiAy71h3Sr; Sat, 17 Nov 2018 11:25:04 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 42xrnr2K3Zz9v0hW; Sat, 17 Nov 2018 11:25:04 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 6BF008B78A; Sat, 17 Nov 2018 11:25:07 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id vLPfGap5chsa; Sat, 17 Nov 2018 11:25:07 +0100 (CET) Received: from po14163vm.idsi0.si.c-s.fr (unknown [192.168.232.3]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 406278B74B; Sat, 17 Nov 2018 11:25:07 +0100 (CET) Received: by po14163vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 042CE69A6C; Sat, 17 Nov 2018 10:25:07 +0000 (UTC) Message-Id: <4745d9467c7d399972dbd12265d0c434cb41e1ea.1542395798.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH 7/7] powerpc/kconfig: remove PPC_STD_MMU_32 and PPC_STD_MMU To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , rjw@rjwysocki.net, viresh.kumar@linaro.org Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-pm@vger.kernel.org Date: Sat, 17 Nov 2018 10:25:07 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org PPC_STD_MMU_32 and PPC_STD_MMU are not used anymore. Remove them. Signed-off-by: Christophe Leroy --- arch/powerpc/Kconfig | 2 +- arch/powerpc/platforms/Kconfig.cputype | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index ac9703e8e722..8ea7c2c02cbf 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -1096,7 +1096,7 @@ config PHYSICAL_START_BOOL config PHYSICAL_START hex "Physical address where the kernel is loaded" if PHYSICAL_START_BOOL - default "0x02000000" if PPC_STD_MMU && CRASH_DUMP && !NONSTATIC_KERNEL + default "0x02000000" if PPC_BOOK3S && CRASH_DUMP && !NONSTATIC_KERNEL default "0x00000000" config PHYSICAL_ALIGN diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index a106e78558c0..7e130035bbba 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype @@ -312,14 +312,6 @@ config SPE If in doubt, say Y here. -config PPC_STD_MMU - def_bool y - depends on PPC_BOOK3S - -config PPC_STD_MMU_32 - def_bool y - depends on PPC_STD_MMU && PPC32 - config ARCH_ENABLE_SPLIT_PMD_PTLOCK def_bool y depends on PPC_BOOK3S_64 @@ -354,7 +346,7 @@ config ARCH_ENABLE_HUGEPAGE_MIGRATION config PPC_MMU_NOHASH def_bool y - depends on !PPC_STD_MMU + depends on !PPC_BOOK3S config PPC_BOOK3E_MMU def_bool y -- 2.13.3