From patchwork Fri Jan 21 08:42:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 12719503 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 1277EC433F5 for ; Fri, 21 Jan 2022 08:42:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A3B046B0092; Fri, 21 Jan 2022 03:42:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9E9A06B0093; Fri, 21 Jan 2022 03:42:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 889CF6B0095; Fri, 21 Jan 2022 03:42:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 7A1806B0092 for ; Fri, 21 Jan 2022 03:42:31 -0500 (EST) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 4643996F0A for ; Fri, 21 Jan 2022 08:42:31 +0000 (UTC) X-FDA: 79053652902.14.1FAC859 Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-eopbgr120073.outbound.protection.outlook.com [40.107.12.73]) by imf03.hostedemail.com (Postfix) with ESMTP id A905C2000B for ; Fri, 21 Jan 2022 08:42:29 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ir7BopmHnyJ/i7Bns3u+baLuynD3HTByqWGbPIWnd/gSVv114JfjBKvgYhVqs4B5bRsyhzKz/rdGmHsiTDQg3noIAQRSAzCM1E6y7jVqHVICCrtP9FGynutOztT3TqPc4M4ieT2sJvg2cziXNpSYkmHYSWYDitI1i85PGim4yQAgYhU7r1oCEnkQiIi9/qvzUEqtXZn5EnoOWZJcttIwtCRsGFGohr4bAzFro94OYL3vN6TKsFRLMwRRuXCTyAq+YVTaf+KbYitsiA9MrBP2HwI8btJ47LIKlScl0n+43ouEG/+fu42CgJ2in9yGw/GzcOpYSfVsXS0O0IyoF1Rlag== 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=BcB2DX1cHDXi9JS6wFdHfyCR3d/PINCnfCWyhq69JXA=; b=MEkYioVhQl0vHFj983RMBIUYdbj3DO29XcjrDz8ZDs4fDsYZ8J4BSuMIZ/hkyK7g7y95dTX0VidlqcJ5Sdg2iFjUzCUPeOutt2VIWTkR0n4en6PdH1+HlTGttaEixgwA0j0vtMQXjPBpVea+Y2/uo1Kjn8Woq7FjGbzGWcs9kKTxmdi5HJJLegK/gfmdB81b3GYS5fdgWOZzOfu9eqOsW5qhWFuhPJDOq6hek5xvhir2L8UA3qtWV0SbeQ+iAsSrpc/8v7vJPjADWfujmraN8OczYZYpGZsw96KaT0TPapFwHY6L4VmBbn1H9dFMiIh0H/IYGi0i4xBU+oWlZR2tGQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:31::15) by PR0P264MB0201.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:4::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.11; Fri, 21 Jan 2022 08:42:27 +0000 Received: from MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM ([fe80::9d4f:1090:9b36:3fc5]) by MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM ([fe80::9d4f:1090:9b36:3fc5%5]) with mapi id 15.20.4909.008; Fri, 21 Jan 2022 08:42:27 +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 v7 07/14] powerpc/mm: Make slice specific to book3s/64 Thread-Topic: [PATCH v7 07/14] powerpc/mm: Make slice specific to book3s/64 Thread-Index: AQHYDqLRddxa/03Vk0SHKge8QDGmPg== Date: Fri, 21 Jan 2022 08:42:27 +0000 Message-ID: <0291cfad5e241a98aff2241fdb6bc30368e66d8a.1642752946.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: 2e6b22f0-f9d0-45e5-bb32-08d9dcb9f45c x-ms-traffictypediagnostic: PR0P264MB0201:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:178; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: PcOaaZHOaiEZtliO6UKAbYqdJ9NBtTFkbkfcrDU+KxiGiCzz+Xfo91QyRNd+ekSrgjkVOV7dOkqQDQCOMmWkPpfZzWFsdswHHKAAY2i21jMzf3Jm/fJcaZGT0IAPTtS+McSuqGbavCi6egM+GsFpa5rJwhW36gHh51BLjnolXSXPhGq8OrO5r5WAXTJpJjq/G3RjOxNPN39IM4FUMsIZTlAOe+IyyNrxL3uDPNQThC0cys48GpPbuNypxinj86bYe+dDH1Ts4is5xr8EyNkTZrT+A3Usk880y2EqnI7+PJusuRiHYA1VNRukJvzGAFDmlHCcv+PheAqwo8ush1LXE65Giix7iGW7IOXv9lKLuXfMKAphW4wL9Hvx5JC6UmZIBlKrqaDnB7pTvA5mNkbk0zOuQYYJPfB1ONlofJc1vM9fVxGRyDchZ8mL024jegS97AmhlAKFnLVcg1m4UyDatqCEZ96f19lsMdiN5Zz+GeIt/gzm4aoCee1HO/KzBHduE/Tq0O7hfib/oZCcdZZpdQ/c2kQXrk4mKaVbfEuec+Db562F9NTRA4tTmG9ZC0P0LZ/Dz7qRodmJYLEHYQbgfSx7cz4zIAwqbhgs8NX6FX2V4OS5TuUUK/jamOZXSvNZg6zpgVBry2MlldsWZg2/icI8G16tRnaJhJAulY3jk1SA6Xe5B3iEbZWN91juclzSRCOng3Lj+paNd/LWaEGbOWcrP1iMsx9Hd1ukKHyu7eU= 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)(76116006)(91956017)(36756003)(66476007)(2906002)(5660300002)(66946007)(8676002)(6512007)(122000001)(71200400001)(8936002)(83380400001)(66446008)(64756008)(4326008)(66556008)(86362001)(26005)(508600001)(6486002)(54906003)(2616005)(44832011)(38070700005)(6506007)(186003)(38100700002)(7416002)(110136005)(316002)(32563001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?ZTeUo4DpnvMlndUZ4d8bnH7?= =?iso-8859-1?q?nddLdocTNa/3xMJTvV8SRhcwg1hBL1j2oX7QJ95mc7o1snwVPlWL4zBCagTS?= =?iso-8859-1?q?nUF29dcAtr7XRVKOIKBbn8Np33G7cTcPjzposy6XVzuS9cj77sXBaV8zibTM?= =?iso-8859-1?q?nj3JjB57nCgJzBT7vDnMyDcm/M4dK/Bst63osaiciPyATQ/7NFctpyRQG2/I?= =?iso-8859-1?q?pjiVG0eHWZS2NDPw3LTJQs/DSvG3YFQE1SMoF9zRb0dWuIQaio/90yOIftcY?= =?iso-8859-1?q?yoNTeFUGSJEDBcCns2PRllOYeXiXdkTjMVjcCnrOoXWPrqKxwmqWKiRnb5KW?= =?iso-8859-1?q?HlqdsheG6WK6QNpbfjsaPJ75CbJyjMLTXIAh6rhJDzvphMqccJ5rIoOPVXil?= =?iso-8859-1?q?z5uPYxBmd6F/C79GSVPTCve3iiR103PvyGS96MJui/XiiYINsLc1C/VyewwJ?= =?iso-8859-1?q?WRW8QuOHuRqzzVS/KQ5xoQgJHMfaubEbUxkP2wYSNvd5Msz57AJdjesiwEAM?= =?iso-8859-1?q?P+kiBs73fupDIwSLuAU2TbGWH0XhOCCKIXqozgFAfdJ8m5i1kdcxTrj5shx3?= =?iso-8859-1?q?eR8iEgiI3ofBXi0/HTKVL/bfMB5Kq6UrqmTYyLDDXBa45CpahNQLcGq9Z71I?= =?iso-8859-1?q?Ux9jObtpl1oWjwgmH/005WIOlpMXGys0YsspF3od+sgXTyQqyWq1v/2YGOR/?= =?iso-8859-1?q?OoXyfX6PWkeKv4PdPFGw/o0J0QBCCL57QW/WRmZR/NMwEt8qRoGpCJ9Rme0j?= =?iso-8859-1?q?iCC5NwP5dLa3ANLhTxnDHiXGcRJK6nOrbb/DoRNjtO5Q4VD9seT98qTB8z1y?= =?iso-8859-1?q?9WZTwyPLVmCmXiO/MfXaumWAp3n/9GffHobkfUCjmi+eqaNI35T8I+j2lW4T?= =?iso-8859-1?q?YfMOcJ9pPGLlOYfZZj+peyNiW6Z0BeQdl8TLA4LINAoxlguB6vXQvTKHZejf?= =?iso-8859-1?q?tvb/ZcUaclshQMhQMPwwC06i4gEhaTjOC3Zm6hjIKSd61iBmwsSPN/8MrOQq?= =?iso-8859-1?q?eSe2NW6JJMvAyMbTUug/rlcU9RtJ2sBq9/I+UzDuCR9sDR7ACpfH1KCWuAjn?= =?iso-8859-1?q?Gab8kVlriU2u1m8lGgfvc8TRidkj2rUXad1DggeCFxwXY4LditD7gSTWp7YN?= =?iso-8859-1?q?UWsiD2nCB4mN2pMe5mIiaPunJ0hHU5my1hjogYuKMNPZOHb7/l3AqaWRdgYW?= =?iso-8859-1?q?vXdTmjoHflEplcOz8jOlxVPCsvbid/Ormp4q/CrhalkyGGR/hj5VGA6T5bS3?= =?iso-8859-1?q?QWbN+yIFIENPise7RylYMD4uDLgQIO0cHt5LLKORYC7ZMywGDbqLQUt4yIdD?= =?iso-8859-1?q?ta6DesyWjdZYzoIGFwDbnYSpUQ+KDnMlWz7lFC7iIEr1ltZGKj5Q9c9/cV7Q?= =?iso-8859-1?q?pXA7JNpWYCv6kpWzZsXNDSKXZ2RQe14UiH4Cq/z/RRFZLVMwP3uArcax00lc?= =?iso-8859-1?q?asnPdfqMI9kdvx4SOxAmIljAQwAFKwVAf0qnjvXfiTbCWH4WuJvpUkux5iG/?= =?iso-8859-1?q?qEjZ93zhDla9RgCGl1Rei+ZA75w+SGEX/ik5zNdFdqJr8tw5PkrT+128aoNW?= =?iso-8859-1?q?bfgRSsHF8roX3Sql81cB8dr6ZAV/F5D0TjwotkkTsjejwIZnyPxYtlZqjLAp?= =?iso-8859-1?q?qY0fs+q8Zh3MvMih36FLZfFXROx8NmsheSk4/bl/rerb1KbTd86YmjSF6vrf?= =?iso-8859-1?q?Gk9YE25F24EMoUo4U6qkzM2uPkUZb7D4IXZNnWiLeCP59KHeNf7cmnv/lLAl?= =?iso-8859-1?q?7k0s=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: 2e6b22f0-f9d0-45e5-bb32-08d9dcb9f45c X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jan 2022 08:42:27.5945 (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: r3EfhDW8H9Ig6jGZyWuvFNH9jnUprzA6nWRHp26I3D0d7dUE9AKE1aj8lIIsT1ABKprjl8B2hmuUKTBoyaM8KtvjRuixEbvZYCOXwvhfym4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR0P264MB0201 Authentication-Results: imf03.hostedemail.com; dkim=none; spf=pass (imf03.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 40.107.12.73 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu; dmarc=none X-Stat-Signature: cwh5x6i66du6tz5juw9jc8eesd75nzks X-Rspamd-Queue-Id: A905C2000B X-Rspamd-Server: rspam12 X-HE-Tag: 1642754549-806340 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: Since commit 555904d07eef ("powerpc/8xx: MM_SLICE is not needed anymore") only book3s/64 selects CONFIG_PPC_MM_SLICES. Move slice.c into mm/book3s64/ Move necessary stuff in asm/book3s/64/slice.h and remove asm/slice.h Signed-off-by: Christophe Leroy Reviewed-by: Nicholas Piggin --- arch/powerpc/include/asm/book3s/64/mmu-hash.h | 1 + arch/powerpc/include/asm/book3s/64/slice.h | 18 ++++++++ arch/powerpc/include/asm/page.h | 1 - arch/powerpc/include/asm/slice.h | 46 ------------------- arch/powerpc/mm/Makefile | 1 - arch/powerpc/mm/book3s64/Makefile | 1 + arch/powerpc/mm/{ => book3s64}/slice.c | 2 - arch/powerpc/mm/nohash/mmu_context.c | 9 ---- arch/powerpc/mm/nohash/tlb.c | 4 -- 9 files changed, 20 insertions(+), 63 deletions(-) delete mode 100644 arch/powerpc/include/asm/slice.h rename arch/powerpc/mm/{ => book3s64}/slice.c (99%) diff --git a/arch/powerpc/include/asm/book3s/64/mmu-hash.h b/arch/powerpc/include/asm/book3s/64/mmu-hash.h index 21f780942911..1c4eebbc69c9 100644 --- a/arch/powerpc/include/asm/book3s/64/mmu-hash.h +++ b/arch/powerpc/include/asm/book3s/64/mmu-hash.h @@ -18,6 +18,7 @@ * complete pgtable.h but only a portion of it. */ #include +#include #include #include diff --git a/arch/powerpc/include/asm/book3s/64/slice.h b/arch/powerpc/include/asm/book3s/64/slice.h index f0d3194ba41b..5b0f7105bc8b 100644 --- a/arch/powerpc/include/asm/book3s/64/slice.h +++ b/arch/powerpc/include/asm/book3s/64/slice.h @@ -2,6 +2,8 @@ #ifndef _ASM_POWERPC_BOOK3S_64_SLICE_H #define _ASM_POWERPC_BOOK3S_64_SLICE_H +#ifndef __ASSEMBLY__ + #define SLICE_LOW_SHIFT 28 #define SLICE_LOW_TOP (0x100000000ul) #define SLICE_NUM_LOW (SLICE_LOW_TOP >> SLICE_LOW_SHIFT) @@ -13,4 +15,20 @@ #define SLB_ADDR_LIMIT_DEFAULT DEFAULT_MAP_WINDOW_USER64 +struct mm_struct; + +unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len, + unsigned long flags, unsigned int psize, + int topdown); + +unsigned int get_slice_psize(struct mm_struct *mm, unsigned long addr); + +void slice_set_range_psize(struct mm_struct *mm, unsigned long start, + unsigned long len, unsigned int psize); + +void slice_init_new_context_exec(struct mm_struct *mm); +void slice_setup_new_exec(void); + +#endif /* __ASSEMBLY__ */ + #endif /* _ASM_POWERPC_BOOK3S_64_SLICE_H */ diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h index 254687258f42..62e0c6f12869 100644 --- a/arch/powerpc/include/asm/page.h +++ b/arch/powerpc/include/asm/page.h @@ -329,6 +329,5 @@ static inline unsigned long kaslr_offset(void) #include #endif /* __ASSEMBLY__ */ -#include #endif /* _ASM_POWERPC_PAGE_H */ diff --git a/arch/powerpc/include/asm/slice.h b/arch/powerpc/include/asm/slice.h deleted file mode 100644 index 0bdd9c62eca0..000000000000 --- a/arch/powerpc/include/asm/slice.h +++ /dev/null @@ -1,46 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_POWERPC_SLICE_H -#define _ASM_POWERPC_SLICE_H - -#ifdef CONFIG_PPC_BOOK3S_64 -#include -#endif - -#ifndef __ASSEMBLY__ - -struct mm_struct; - -#ifdef CONFIG_PPC_MM_SLICES - -#ifdef CONFIG_HUGETLB_PAGE -#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA -#endif -#define HAVE_ARCH_UNMAPPED_AREA -#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN - -unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len, - unsigned long flags, unsigned int psize, - int topdown); - -unsigned int get_slice_psize(struct mm_struct *mm, unsigned long addr); - -void slice_set_range_psize(struct mm_struct *mm, unsigned long start, - unsigned long len, unsigned int psize); - -void slice_init_new_context_exec(struct mm_struct *mm); -void slice_setup_new_exec(void); - -#else /* CONFIG_PPC_MM_SLICES */ - -static inline void slice_init_new_context_exec(struct mm_struct *mm) {} - -static inline unsigned int get_slice_psize(struct mm_struct *mm, unsigned long addr) -{ - return 0; -} - -#endif /* CONFIG_PPC_MM_SLICES */ - -#endif /* __ASSEMBLY__ */ - -#endif /* _ASM_POWERPC_SLICE_H */ diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile index df8172da2301..d4c20484dad9 100644 --- a/arch/powerpc/mm/Makefile +++ b/arch/powerpc/mm/Makefile @@ -14,7 +14,6 @@ obj-$(CONFIG_PPC_MMU_NOHASH) += nohash/ obj-$(CONFIG_PPC_BOOK3S_32) += book3s32/ obj-$(CONFIG_PPC_BOOK3S_64) += book3s64/ obj-$(CONFIG_NUMA) += numa.o -obj-$(CONFIG_PPC_MM_SLICES) += slice.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-noncoherent.o obj-$(CONFIG_PPC_COPRO_BASE) += copro_fault.o diff --git a/arch/powerpc/mm/book3s64/Makefile b/arch/powerpc/mm/book3s64/Makefile index 2d50cac499c5..af2f3e75d458 100644 --- a/arch/powerpc/mm/book3s64/Makefile +++ b/arch/powerpc/mm/book3s64/Makefile @@ -21,6 +21,7 @@ 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/slice.c b/arch/powerpc/mm/book3s64/slice.c similarity index 99% rename from arch/powerpc/mm/slice.c rename to arch/powerpc/mm/book3s64/slice.c index 8a3ac062b71e..e4382713746d 100644 --- a/arch/powerpc/mm/slice.c +++ b/arch/powerpc/mm/book3s64/slice.c @@ -692,7 +692,6 @@ void slice_init_new_context_exec(struct mm_struct *mm) bitmap_fill(mask->high_slices, SLICE_NUM_HIGH); } -#ifdef CONFIG_PPC_BOOK3S_64 void slice_setup_new_exec(void) { struct mm_struct *mm = current->mm; @@ -704,7 +703,6 @@ void slice_setup_new_exec(void) mm_ctx_set_slb_addr_limit(&mm->context, DEFAULT_MAP_WINDOW); } -#endif void slice_set_range_psize(struct mm_struct *mm, unsigned long start, unsigned long len, unsigned int psize) diff --git a/arch/powerpc/mm/nohash/mmu_context.c b/arch/powerpc/mm/nohash/mmu_context.c index 85b048f04c56..ccd5819b1bd9 100644 --- a/arch/powerpc/mm/nohash/mmu_context.c +++ b/arch/powerpc/mm/nohash/mmu_context.c @@ -317,15 +317,6 @@ void switch_mmu_context(struct mm_struct *prev, struct mm_struct *next, */ int init_new_context(struct task_struct *t, struct mm_struct *mm) { - /* - * We have MMU_NO_CONTEXT set to be ~0. Hence check - * explicitly against context.id == 0. This ensures that we properly - * initialize context slice details for newly allocated mm's (which will - * have id == 0) and don't alter context slice inherited via fork (which - * will have id != 0). - */ - if (mm->context.id == 0) - slice_init_new_context_exec(mm); mm->context.id = MMU_NO_CONTEXT; mm->context.active = 0; pte_frag_set(&mm->context, NULL); diff --git a/arch/powerpc/mm/nohash/tlb.c b/arch/powerpc/mm/nohash/tlb.c index fd2c77af5c55..7e1e7c3dc66a 100644 --- a/arch/powerpc/mm/nohash/tlb.c +++ b/arch/powerpc/mm/nohash/tlb.c @@ -773,9 +773,5 @@ void __init early_init_mmu(void) #ifdef CONFIG_PPC_47x early_init_mmu_47x(); #endif - -#ifdef CONFIG_PPC_MM_SLICES - mm_ctx_set_slb_addr_limit(&init_mm.context, SLB_ADDR_LIMIT_DEFAULT); -#endif } #endif /* CONFIG_PPC64 */