From patchwork Fri Dec 17 10:27:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 12684215 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4978C433F5 for ; Fri, 17 Dec 2021 10:31:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 47F0D6B0080; Fri, 17 Dec 2021 05:28:01 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 42E6B6B0081; Fri, 17 Dec 2021 05:28:01 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2A8176B0082; Fri, 17 Dec 2021 05:28:01 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 1E33C6B0080 for ; Fri, 17 Dec 2021 05:28:01 -0500 (EST) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id D8FC18249980 for ; Fri, 17 Dec 2021 10:27:50 +0000 (UTC) X-FDA: 78926910300.28.1FDF4B6 Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-eopbgr120059.outbound.protection.outlook.com [40.107.12.59]) by imf23.hostedemail.com (Postfix) with ESMTP id 85910140011 for ; Fri, 17 Dec 2021 10:27:45 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RoQLj1n4uD23yVRU+k1i8EukaH8lLs/0WoviHhciKPD5Se65i7VZ4zEqT4ye+8Rn4teKdlIml6a7HOyIbB7+Iwq6H9DFF33zueHn4WE7X5P+3fpHNKsv8PQDXxVOJ6ETKt3Z9u/E9bTiYRM9I/9DeM/CD2lG3TqHGdz/8gU3u0nS34kEaXklvKJZpLNjiTWD+Ei37XdbWB6tgN3YlMLofIrAelFYiMbkSinooL0CCUErOWcf/YiUpOOyljwj0jfxgvtxlGXT4ZQ+zfxocu3sMQYS/2TqxTO71tqVoDepEA7IRzH4PlJ4ub1GgeW3ECEKK0ErC2J4DWHgGnMoblFgRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=39FFmOvJEbICLmGjehFIN4rt9ehZmkF/y1NsezPHRsA=; b=fAg+OcXmW5ujhdm2sUdJkI+qKsPxgT0PKwSzH1xdwQi+ndcKyt+6gkuET680UUN8p6abfUMCTFXJLWEeKcJ+UOwHXxQLvLaLJN/aTCzisVjqtcyMdB48T8YHr7sXQ7xaBzPY6z3QPaJVXk/DAcpOmNJTh9ukNrdoIJGTWv2r2S9qA7aD8QwJ5PJs4vdAjC14ruS5G8vgqAUkJEn41ybz2D90jHx8RQAU0yGKQDLHL+FC81Ey3DYcNne0nUd4N8PZpuODTfIxFD5AcIbgQCA//WC9yCQ3gKPLBjSdWcmMXVion9JUrpGED64dWDfgdoakdz/9P7cXFUmJHccTIEg2wQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=csgroup.eu; dmarc=pass action=none header.from=csgroup.eu; dkim=pass header.d=csgroup.eu; arc=none Received: from MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:31::15) by MR2P264MB0146.FRAP264.PROD.OUTLOOK.COM (2603:10a6:500:e::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.14; Fri, 17 Dec 2021 10:27:48 +0000 Received: from MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM ([fe80::f0ef:856d:b0de:e85d]) by MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM ([fe80::f0ef:856d:b0de:e85d%5]) with mapi id 15.20.4801.016; Fri, 17 Dec 2021 10:27:48 +0000 From: Christophe Leroy To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , "alex@ghiti.fr" CC: Christophe Leroy , "linux-kernel@vger.kernel.org" , "linuxppc-dev@lists.ozlabs.org" , "linux-mm@kvack.org" , "akpm@linux-foundation.org" , "catalin.marinas@arm.com" , "will@kernel.org" , "linux-arm-kernel@lists.infradead.org" , Nicholas Piggin Subject: [PATCH v6 08/14] powerpc/mm: Remove CONFIG_PPC_MM_SLICES Thread-Topic: [PATCH v6 08/14] powerpc/mm: Remove CONFIG_PPC_MM_SLICES Thread-Index: AQHX8zC9azDg+V7pj0qHryg9Tl75pw== Date: Fri, 17 Dec 2021 10:27:48 +0000 Message-ID: <5628af991a438cf96d06df5f40bb945742928b95.1639736449.git.christophe.leroy@csgroup.eu> References: In-Reply-To: Accept-Language: fr-FR, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 63bf9857-ef8c-4c1f-a4d0-08d9c147df89 x-ms-traffictypediagnostic: MR2P264MB0146:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4125; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: w24+gJ3vBvDiLYPnbQ+YhVW4SPltr7LGzVw378mBhH6XZmngzKddZpbiy9Sb4aYdq1tqDwxQNTbKmQuH2n0XAbXo/yOPvSwiNsnt4aEfLdqbviNNnQkq4uc91NomOAoCC1n/wg58PNrPIqHgMmDX//oOWQ4/axKhuKxgCikYmSa9t4iEA0zvXGHOm4SWeix8S+AVQhyZxg+KvWFzdHAEJHy/YolbsDBUyH/Do9TCMosyCyEYYdiElv3pNMmH8GgLf7r1s8fkNcoBwVvBoACvsn/GyECqV5jo8ZsigJT31qMfxEUsQAC2cRIwZaPsFUCA3fX371KsAoKXy1AF0H9J+J7tt34tHC+FMtOOgzufRcp1Hw1wC823uIGsbf7kWtILb4+QqvcLPdjGJuhh5u4p6fBusg+gkuOzaBOQRso8O8t7Sc5Upm/Qk5qjuVLmHwIS2CvBAXDMjPhliHeOlJaMTV+weCsvn3mNyQPtVqhAdcY1GsPoHJfLV2JEKTRZdgMxx/LrlI0EFXPw/svksIM09GTuyuyWGq4CynhVzGI/3RuacJgWZe4aAyYRu3siNKtn47D94mVxLtIYADdxlbdg2cBkMOvsjeyE1wIArsgaS9Y4dcyM5zvZibXyJOkiFKrEM6UJgr1AFv9Ve6ngDbFIT13MxRwUQo+LtrlntUTjzhP5RfESEOSl9yx3wkfFxaP8c2Ej5ECA+esX+1fDNPqd5g== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(4636009)(366004)(186003)(91956017)(71200400001)(86362001)(83380400001)(66476007)(66556008)(66446008)(2906002)(64756008)(38070700005)(7416002)(44832011)(6506007)(76116006)(4326008)(36756003)(26005)(2616005)(5660300002)(122000001)(8936002)(38100700002)(508600001)(6486002)(54906003)(110136005)(66946007)(8676002)(316002)(6512007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?GCMrwfus0uM3b0MtByzAtsy?= =?iso-8859-1?q?o0yqux+jKQvHtqLQznQoBQMyCrMd9ZID7rPjJHEsZlxn8lz6JOmfR5h4liJ1?= =?iso-8859-1?q?Ei8i20WNz4hzJ0Qa688ClnlTNeADgCuFz7XywPlrlwTrVBzBTsx+rSAPoMiN?= =?iso-8859-1?q?u72IEndpiU368wgpUmMJ1BRto1hMfj+9eBs9rAfgYTNYXVQUCBWF59DlE0Iy?= =?iso-8859-1?q?UnOujJBrPPfh2nUFvttUGfsjAI+wTjTstSURakX8Ig+yvgMXQtHkpnpYMqJE?= =?iso-8859-1?q?zf+P3Qupn1w/3OfCbAu60QmVNBkvjbyUwU3NT5IPnUBsPTSqCO8X4lBcrsw1?= =?iso-8859-1?q?UMeHCyhSGc9xE4nEZivJsydQZo3j4Qym8Zqo568wJ610SU2FK15xei33kJYw?= =?iso-8859-1?q?dMlUGLJwHf6HdnggK6W9X4N7Xu+ZSYyRZrrjr/HGT0eV7hGu1OjC/eipCI99?= =?iso-8859-1?q?qiqJh45Qj7Io6yfokfingsvxnbuw4FULPWiOgnBunkfasFvM739lBH75mC2K?= =?iso-8859-1?q?OTyObiqtCBfhOYYIVA8l4nUrKh5ziCz897H6J39QXs2h+OpuXAgXm6SU8YaF?= =?iso-8859-1?q?2qOHyosOHvY9h7LQ/rqLTb5YRjSdC2IG8G6lsjy30MN+tWdTwION8Aw7UqqY?= =?iso-8859-1?q?B6Tqev/e+7V6CyyO7iSExBopzVNt0wJNjP+Vjc39mFL9cY21kj0feVuVsC6d?= =?iso-8859-1?q?K1oJp72yu1ZvUibqJPpFpf7XgE8W13q3VUb5FngoK2EPCzPfc/EC4iMtX53N?= =?iso-8859-1?q?lLx/eQAQu+0J+63m4IQd6PJdla9ffb5Qa4sOsfH9BoUMYTlIja2H2VjwwouG?= =?iso-8859-1?q?EaUhg1vWixecLiqjhPuFZTjlBVDjrLvH5YGjnu2eWa6Rd/p7YfwnHZxYHzel?= =?iso-8859-1?q?qiotvyNvXVKsoMcU58Ek09VAdWX93119EYwmnu3wWyQjUyKmKsap+ZultVce?= =?iso-8859-1?q?DauH+uJLW7E0iXQlz/MxO7k/1wOXq0Az+dQ4/k8lfnRyBiLzTcAnDXJcih2F?= =?iso-8859-1?q?D+IV2ISZL8aqCmptfjANqkQmvUV/KUzoBfOKdVUSOtvstgdlz6rrSEOQggjl?= =?iso-8859-1?q?I6Xvn2Vi16Wu+YsV4luWGzs8g3iSQu5C3aRU8D863rif1/H6bpWffDi1KrZ9?= =?iso-8859-1?q?BwbgHIdyB7mlOxAGP6rnDgnoBgwrKS6pD1qjueeVHhoFj71bQE17xbK2CBOT?= =?iso-8859-1?q?H/X7fIj3EQmxLoBELkTVb9DdRy4g70WzU5fVvR+wcWSw3bes7HJEA9UP8MV/?= =?iso-8859-1?q?wbXDKndoK56fTB+UriZriH+xBRp5OQYVtEbpZUXk0cYra/9/MBcC42kKxJ3E?= =?iso-8859-1?q?MuUDUClMI8e40CBS0fTdd46GU9fH9Z2ANPcpFbyWtHIr2WIZi4Km+82B2bWD?= =?iso-8859-1?q?R9IMwPoDpl4xmNUMfALRXzZI4MTS5M6xVEYtYRmqia9sXmD8i/EpZhlTt8W4?= =?iso-8859-1?q?N4ePnAa8MKQodrOLo8xT2No5tkvHTXEGacV63Z2aWAnDnF/Ly7VYuR2tHRs1?= =?iso-8859-1?q?eE/IolAO1wwpwO4y/OmfeLZ6HjViNxOvJdPuLGo0gjNTeZQvZgUKXKxhBT9t?= =?iso-8859-1?q?S0kDysTl8LDpG0SUkNAzjlpP8Aua6APBSjZ2Z70ZUl2gjmG89+eHBPyg01mz?= =?iso-8859-1?q?aciOaz2qLO+H1BFB8I5g1rdi9bBXcdD0HlxxdNdg5OU3HZ7q2Ys15p1Jwh0o?= =?iso-8859-1?q?DqjqZtjJUlLAd6UXmqz7NfR0AFCuElDUCrjAKZJ1yE9SZFrjrvWgw39cgsKD?= =?iso-8859-1?q?wTK8=3D?= MIME-Version: 1.0 X-OriginatorOrg: csgroup.eu X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 63bf9857-ef8c-4c1f-a4d0-08d9c147df89 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Dec 2021 10:27:48.6346 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 9914def7-b676-4fda-8815-5d49fb3b45c8 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: j5CO/SMK7sTLP/QelzLr2ae8Ca0DLwEwSTFwJ6Oh9YFx/8rBX8rk76WGVUqT+Rl6Q5rwt3y4GhaChdh7zZNQWyioJuBMjelAfdRLwDTvzmw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MR2P264MB0146 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 85910140011 X-Stat-Signature: 5rfoa7io3hafx16tyhfn9xim14u3dkg9 Authentication-Results: imf23.hostedemail.com; dkim=none; spf=pass (imf23.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 40.107.12.59 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu; dmarc=none X-HE-Tag: 1639736865-854062 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: CONFIG_PPC_MM_SLICES is always selected by hash book3s/64. CONFIG_PPC_MM_SLICES is never selected by other platforms. Remove it. Signed-off-by: Christophe Leroy Reviewed-by: Nicholas Piggin --- arch/powerpc/include/asm/hugetlb.h | 2 +- arch/powerpc/include/asm/paca.h | 7 ------- arch/powerpc/kernel/paca.c | 5 ----- arch/powerpc/mm/book3s64/Makefile | 3 +-- arch/powerpc/mm/book3s64/hash_utils.c | 14 -------------- arch/powerpc/mm/hugetlbpage.c | 2 +- arch/powerpc/mm/mmap.c | 4 ++-- arch/powerpc/platforms/Kconfig.cputype | 4 ---- 8 files changed, 5 insertions(+), 36 deletions(-) diff --git a/arch/powerpc/include/asm/hugetlb.h b/arch/powerpc/include/asm/hugetlb.h index f18c543bc01d..86a60ba6bd2a 100644 --- a/arch/powerpc/include/asm/hugetlb.h +++ b/arch/powerpc/include/asm/hugetlb.h @@ -24,7 +24,7 @@ static inline int is_hugepage_only_range(struct mm_struct *mm, unsigned long addr, unsigned long len) { - if (IS_ENABLED(CONFIG_PPC_MM_SLICES) && !radix_enabled()) + if (IS_ENABLED(CONFIG_PPC_64S_HASH_MMU) && !radix_enabled()) return slice_is_hugepage_only_range(mm, addr, len); return 0; } diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h index 295573a82c66..bd4dd02e61c8 100644 --- a/arch/powerpc/include/asm/paca.h +++ b/arch/powerpc/include/asm/paca.h @@ -152,16 +152,9 @@ struct paca_struct { struct tlb_core_data tcd; #endif /* CONFIG_PPC_BOOK3E */ -#ifdef CONFIG_PPC_BOOK3S #ifdef CONFIG_PPC_64S_HASH_MMU -#ifdef CONFIG_PPC_MM_SLICES unsigned char mm_ctx_low_slices_psize[BITS_PER_LONG / BITS_PER_BYTE]; unsigned char mm_ctx_high_slices_psize[SLICE_ARRAY_SIZE]; -#else - u16 mm_ctx_user_psize; - u16 mm_ctx_sllp; -#endif -#endif #endif /* diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c index 39da688a9455..ba593fd60124 100644 --- a/arch/powerpc/kernel/paca.c +++ b/arch/powerpc/kernel/paca.c @@ -344,15 +344,10 @@ void copy_mm_to_paca(struct mm_struct *mm) { mm_context_t *context = &mm->context; -#ifdef CONFIG_PPC_MM_SLICES VM_BUG_ON(!mm_ctx_slb_addr_limit(context)); memcpy(&get_paca()->mm_ctx_low_slices_psize, mm_ctx_low_slices(context), LOW_SLICE_ARRAY_SZ); memcpy(&get_paca()->mm_ctx_high_slices_psize, mm_ctx_high_slices(context), TASK_SLICE_ARRAY_SZ(context)); -#else /* CONFIG_PPC_MM_SLICES */ - get_paca()->mm_ctx_user_psize = context->user_psize; - get_paca()->mm_ctx_sllp = context->sllp; -#endif } #endif /* CONFIG_PPC_64S_HASH_MMU */ diff --git a/arch/powerpc/mm/book3s64/Makefile b/arch/powerpc/mm/book3s64/Makefile index af2f3e75d458..d527dc8e30a8 100644 --- a/arch/powerpc/mm/book3s64/Makefile +++ b/arch/powerpc/mm/book3s64/Makefile @@ -5,7 +5,7 @@ ccflags-y := $(NO_MINIMAL_TOC) obj-y += mmu_context.o pgtable.o trace.o ifdef CONFIG_PPC_64S_HASH_MMU CFLAGS_REMOVE_slb.o = $(CC_FLAGS_FTRACE) -obj-y += hash_pgtable.o hash_utils.o hash_tlb.o slb.o +obj-y += hash_pgtable.o hash_utils.o hash_tlb.o slb.o slice.o obj-$(CONFIG_PPC_HASH_MMU_NATIVE) += hash_native.o obj-$(CONFIG_PPC_4K_PAGES) += hash_4k.o obj-$(CONFIG_PPC_64K_PAGES) += hash_64k.o @@ -21,7 +21,6 @@ obj-$(CONFIG_PPC_RADIX_MMU) += radix_hugetlbpage.o endif obj-$(CONFIG_SPAPR_TCE_IOMMU) += iommu_api.o obj-$(CONFIG_PPC_PKEY) += pkeys.o -obj-$(CONFIG_PPC_MM_SLICES) += slice.o # Instrumenting the SLB fault path can lead to duplicate SLB entries KCOV_INSTRUMENT_slb.o := n diff --git a/arch/powerpc/mm/book3s64/hash_utils.c b/arch/powerpc/mm/book3s64/hash_utils.c index eced266dc5e9..7ecadf5e6bf9 100644 --- a/arch/powerpc/mm/book3s64/hash_utils.c +++ b/arch/powerpc/mm/book3s64/hash_utils.c @@ -1264,7 +1264,6 @@ unsigned int hash_page_do_lazy_icache(unsigned int pp, pte_t pte, int trap) return pp; } -#ifdef CONFIG_PPC_MM_SLICES static unsigned int get_paca_psize(unsigned long addr) { unsigned char *psizes; @@ -1281,12 +1280,6 @@ static unsigned int get_paca_psize(unsigned long addr) return (psizes[index >> 1] >> (mask_index * 4)) & 0xF; } -#else -unsigned int get_paca_psize(unsigned long addr) -{ - return get_paca()->mm_ctx_user_psize; -} -#endif /* * Demote a segment to using 4k pages. @@ -1710,7 +1703,6 @@ DEFINE_INTERRUPT_HANDLER_RAW(do_hash_fault) return 0; } -#ifdef CONFIG_PPC_MM_SLICES static bool should_hash_preload(struct mm_struct *mm, unsigned long ea) { int psize = get_slice_psize(mm, ea); @@ -1727,12 +1719,6 @@ static bool should_hash_preload(struct mm_struct *mm, unsigned long ea) return true; } -#else -static bool should_hash_preload(struct mm_struct *mm, unsigned long ea) -{ - return true; -} -#endif static void hash_preload(struct mm_struct *mm, pte_t *ptep, unsigned long ea, bool is_exec, unsigned long trap) diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index 0eec3b61bd13..f18b3a1d18f0 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c @@ -558,7 +558,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, return radix__hugetlb_get_unmapped_area(file, addr, len, pgoff, flags); #endif -#ifdef CONFIG_PPC_MM_SLICES +#ifdef CONFIG_PPC_64S_HASH_MMU return slice_get_unmapped_area(addr, len, flags, file_to_psize(file), 1); #endif BUG(); diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c index c475cf810aa8..9b0d6e395bc0 100644 --- a/arch/powerpc/mm/mmap.c +++ b/arch/powerpc/mm/mmap.c @@ -190,7 +190,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long pgoff, unsigned long flags) { -#ifdef CONFIG_PPC_MM_SLICES +#ifdef CONFIG_PPC_64S_HASH_MMU return slice_get_unmapped_area(addr, len, flags, mm_ctx_user_psize(¤t->mm->context), 0); #else @@ -204,7 +204,7 @@ unsigned long arch_get_unmapped_area_topdown(struct file *filp, const unsigned long pgoff, const unsigned long flags) { -#ifdef CONFIG_PPC_MM_SLICES +#ifdef CONFIG_PPC_64S_HASH_MMU return slice_get_unmapped_area(addr0, len, flags, mm_ctx_user_psize(¤t->mm->context), 1); #else diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index 87bc1929ee5a..c775b566e7b4 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype @@ -376,7 +376,6 @@ config SPE config PPC_64S_HASH_MMU bool "Hash MMU Support" depends on PPC_BOOK3S_64 - select PPC_MM_SLICES default y help Enable support for the Power ISA Hash style MMU. This is implemented @@ -450,9 +449,6 @@ config PPC_BOOK3E_MMU def_bool y depends on FSL_BOOKE || PPC_BOOK3E -config PPC_MM_SLICES - bool - config PPC_HAVE_PMU_SUPPORT bool