From patchwork Wed Dec 15 06:45:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 12696189 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7395DC433EF for ; Wed, 15 Dec 2021 06:52:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=6HmAGRmct/LLzVoFj+4zRzII+avx9zT4J3B0D9MLcAk=; b=zsBqoxA9/GyP61 1sG+0vmkG/LxZY49luI2agszcdfSSL7Fq+ejuDAgWKs8B+kMEBsiS9pNJ1veQ5OFPx1s7fHGhHjC7 f5uXXfqqW6/xTj6M+ljCcAQPGBEavIHeqtHjq+t4jZL1ONY6tV8Da6Bd413LNiIbXizgqtyK4kBZ6 JZuIJsONTwTuCSgjd+TLPzzZrID2BJIgmMO/KtspU/PWHMg+O8CalesBrEwZgv/U+GXc7K7LV/db8 FSDH4VOEYFZL02oCGPDrQhxlgzTM6h5mKyJ0bCbWInyoe3iLDajmdoGK5hGEyT/z40WrPWlxAsW9d CDqOdKE/UHccuvfn3NVQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxO7I-00GzHD-VV; Wed, 15 Dec 2021 06:50:21 +0000 Received: from mail-mr2fra01on0609.outbound.protection.outlook.com ([2a01:111:f400:7e19::609] helo=FRA01-MR2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxO2X-00GxNe-CC for linux-arm-kernel@lists.infradead.org; Wed, 15 Dec 2021 06:45:27 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V73aBlTq7b+bc7IpoxE9/GN7WtyO22DjpezcPGHl0r7EJ8W/LwHMW/9nOkvbJcInVs8CWfCamBoENeR5nTf/AWAe8oaC8cAkDVMntG13dJBk92SD2VIJHSwGDtlHUC8kcY7kQi91cZRe2iZb3hkI9kjbz+m05WGHpl1XAHyvnyw0/y4Yrkxq5/z55Ji/jsjbTON2z8qBezAFh+LgzuLfbYFkNXlOjd0jO/U5q60fD5dvKOXNs15eMA5sdV6PQhKKw3yMaj4C2ZJrTS8Npx2FItMzp4aLzpUgCaCvbVCenNQLN1TE+RjgydtskQ1PjtANTmz+tM2dfWgiBUZ+L3J+gA== 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=cQrNauodU090zIm3u7BiKaEfnqKUaWOcg4GBwtenQ1UsL4ZpbZs7R/oh/YbLTZ1hry3emPX9iCWuW0OhCk2sABKEzYPds1aMizw5zKrDTtO4HO+YUmAMDfkYfk8cdXWhkscmyF37LOx4ML6V8du4ikPrRzdK0FbnK+2WoNOkLONY5XzAnssk/cgadPkY4WY2RAuN618yOzbNJNxJIF712GYqC9IQTwuMTFhW8K2pfCNZR1vLsWXBOSpFM22nyj0R13Hc0OcLwoKBXbkGytJz1t0PCT6ug06Ah3ToaoQeFFMl7aRTQNwaPjtUxYEkKXQVScPV44mWIL3jwDSVw4SIuw== 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 MR1P264MB2147.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:11::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.16; Wed, 15 Dec 2021 06:45:12 +0000 Received: from MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM ([fe80::fc67:d895:7965:663f]) by MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM ([fe80::fc67:d895:7965:663f%2]) with mapi id 15.20.4778.018; Wed, 15 Dec 2021 06:45:12 +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 v5 06/11] powerpc/mm: Remove CONFIG_PPC_MM_SLICES Thread-Topic: [PATCH v5 06/11] powerpc/mm: Remove CONFIG_PPC_MM_SLICES Thread-Index: AQHX8X9PxLw9vB0ed0+/1Dy1MbNFwQ== Date: Wed, 15 Dec 2021 06:45:12 +0000 Message-ID: References: In-Reply-To: Accept-Language: fr-FR, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=csgroup.eu; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a84e2282-d11d-46e5-56d3-08d9bf9671fb x-ms-traffictypediagnostic: MR1P264MB2147: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: hjamjGD+4NueG/LWuUtPQZEda+3CiUl3X6cZeYMWJ90hwBeZ5+w3zrXC65eRF6KySLUYzPIg4bCTYrPUy6zarTA1P7BWFNWtcsQJJ3BLF5zuMdui41r+6ZUuff7AJ/3Roh4S+Q+TxMO9nilUYJhfTdqUnHzHGij10zKXM08oQgHgS0lqpFO8EhTzPe/NLh5DeF8vyKBYw7Te98VxXaLsRrfrq1scK6w37GrxCEclTdf3qdzPAa6OBGG8A7A6GSCicn+aqedPeLNmm1WWC+k+fh8L1mN6cyaF7BZFqdgla8pvPoEBwt7q62q8hwuPP1nsN/8NElbcOjCQ3P/Jvx6b32sjaLdvUsr1e+IYIqEn88TboEXlzlAZm0NbX4+B4qt7nEKLLLV+DU4Hl2ecUB7eTm1nhMqtrU6/55Y4Y4ztWbde2EkqgjYGAj/d/yXrbhi78EtJ+Ip1Pad9pGMkHNyAeoVo55RrmojZZ93CFGTm+fQNDoDmDgUzRfFdD5vRi+X0fefzj8KJtebKilmloLDhKPw8lb2pA/L2gnVTBxZ9sQp0FXKOHdL2VBkfvEvPdDTjLTKrAapuBskIzrS+VH9Ag1CxWfZ6XLcqoYNZAFOyasmpH0Ze8Mnu0y8bUuch9cvRRhDQTRw/B3uwTwbbEnRHVltHsxQDxlKFrrMGGRFtwZ7ECIYKXkjQ+WfXV7d96X0PT5076k3LA733I5ynYrUlQQ== 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)(110136005)(36756003)(6486002)(2906002)(86362001)(5660300002)(508600001)(26005)(186003)(38100700002)(8936002)(44832011)(54906003)(316002)(66556008)(66446008)(66476007)(64756008)(6506007)(76116006)(91956017)(8676002)(66946007)(4326008)(2616005)(122000001)(83380400001)(6512007)(71200400001)(38070700005)(7416002); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?/fEFe63vnux9OnFYyxbKfhT?= =?iso-8859-1?q?bZQPcKGkV9g8ANjwO9qO3RxGWqHHTD7po4CzVly6j/s1zxm1Xw1eJ6lsSNMU?= =?iso-8859-1?q?qNZTrHEx4PKItdgX1teE68kOE/CJBX1hE1CMmmwycsRs0u8/xdZlM5wXQL+T?= =?iso-8859-1?q?6+tkxcJIr4PwZKYfRiwSY/KZdazFzZAKKziW8hgD+BHaC3jDdQPZBqtOmdSQ?= =?iso-8859-1?q?pdzvFGZ5U9xzTT50k+y+SA6ORDVjT8iseHKQFqACSU8stJVERu6dyo3TN0JI?= =?iso-8859-1?q?NH+on7fZACwYv2DBo2lIFe8Y+b47kLh3JDLnQSVllzqKPS96hDo5FT0rrQOF?= =?iso-8859-1?q?OtcXV0KkCL/ttWMu+Lwrv7x3zbl7Vmr9X5lmABKQcAnAYHOyjOGjsuej6zIs?= =?iso-8859-1?q?v9PjFRfFzIlNCLZBbRpr9HJIfeDXuGqq26XAlk0TLUJ2H4gQfjYUuDpx6KOf?= =?iso-8859-1?q?vhi8tMie7lMX5Sz34lU8LFlHuLHi2rePrL3SDEDFR1AkX9xXmRHDlsHJnCz/?= =?iso-8859-1?q?vRwrB6gO3/1C8AE6DKmaUGUgLYl0Xad68uUJsNV5pi7Pcnnv6DMRjvUqfTnm?= =?iso-8859-1?q?yYvqofemtzcxepEStYR6pfQLypf9tKiDmCl/dbVqacI2w/swgKiZxVqSdn7M?= =?iso-8859-1?q?djoOeIznniKM3Px+D0i1vg5/8svmyh+EcnKL8cWLaE0pBwrFFiaSrsZIDS6h?= =?iso-8859-1?q?DAEUUIfYMc/yfG612G1RDaOQ8tKBeOGX7Q1hg351BevM1Tb4l6PoYrYtAMhV?= =?iso-8859-1?q?9/F5Pi0Lh2FGskYuRymQ8agx8V9mghwAwv64GawbWQ2gfUvNKmMjOV2CWmZ3?= =?iso-8859-1?q?oirOfI9FwPyiAYdwrDnMeBpSRQCF5sbfAfrlQEJOTq8nGZELcXiDaKNQ75JJ?= =?iso-8859-1?q?gFLqdJD2wcep7g2hH7pUkqs/MDvcFL/lRey8A7ocvmnj43kZLObW5aTd8gzs?= =?iso-8859-1?q?Wt1/t0fgKMsZezQGEjTD+Y0J0p9WbVGQMCdblqTsqYrGrVuLDOeXz70Myuj6?= =?iso-8859-1?q?65GmoZGimelbd43m5/QfwO0URtY9J+TylsxT846Sv05+ywpqRcGERohwWXXp?= =?iso-8859-1?q?XM/0MN6jCxpQoibx/oTWzJ8z8hJeKmU7KYI4WmNIrgf63/Md//mRoidjHcI0?= =?iso-8859-1?q?yUFCuFFxnIEIs15y2qzkXakt1aKVSOD2wK+3Csd92G89wFaxB0nyrm3gBsGr?= =?iso-8859-1?q?jS6yParql3x0HVJIaO0lLGmWTaFSFk4qYWUT3Jr+5NTfEipQDei53t1k2wMp?= =?iso-8859-1?q?HovBAarVqVDl+GOmQ6R4fOfhnrf4rcOEYNi4yMo3irOxkOZyKtvsZvzqh1Ix?= =?iso-8859-1?q?SRbOmF1M5U9LLJSRKSRBq0d9CvLzE02J0yeLi0CcxWM2lmvKli96hGvSs8Ho?= =?iso-8859-1?q?qXipCgD8qly0Cqliacgm3CVh1uO2LkgXjsnGSfBCcDZMVvwumFqDBA3dBs13?= =?iso-8859-1?q?VWLQD+WSnCRbX44AUXNLZNo4l+o5RrOwe8j7d6L2F+3KtILZZBxCTcLJsVUY?= =?iso-8859-1?q?i4q28RS3Lk/6iwk5ECm/dIEES+Gi0bQJ7vmdENbitFLYCvWWiC7ep2bWpYnA?= =?iso-8859-1?q?RtIiCO+qkEzoQNg6ZcI4BktL2ZXvm5++G+oRHGiL85yDVcWADx8ALhHxOQbx?= =?iso-8859-1?q?DiBPbcUb0rBa7dTCnKuhWdjJIAEIWZt8nwidP76tDFgTBXYCsZfpUxcdla/p?= =?iso-8859-1?q?2elnG/UCfsvO9Zi3OtPqUdvygA+m7rFnKwdvtOuy4Uxi5qIPKBZ/Mud4d6LS?= =?iso-8859-1?q?YGDM=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: a84e2282-d11d-46e5-56d3-08d9bf9671fb X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Dec 2021 06:45:12.5861 (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: xNwG/Bflk/9+ucCyEy8n7S62/nhgxpRNTp018NZe2jznN9V8FRag3ZK8c62DSjmYt1nZqTAGfaJla9/uE0QQLm/ruPwf7u3pZYHoj/OYQC4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MR1P264MB2147 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211214_224525_475751_41C2ED25 X-CRM114-Status: GOOD ( 15.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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