From patchwork Wed Dec 8 17:18:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 12664911 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 C9ABEC433F5 for ; Wed, 8 Dec 2021 17:20:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 37C706B0075; Wed, 8 Dec 2021 12:18:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 32BB36B0078; Wed, 8 Dec 2021 12:18:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 17E906B007B; Wed, 8 Dec 2021 12:18:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0240.hostedemail.com [216.40.44.240]) by kanga.kvack.org (Postfix) with ESMTP id 05F656B0075 for ; Wed, 8 Dec 2021 12:18:34 -0500 (EST) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id B9625180238C2 for ; Wed, 8 Dec 2021 17:18:23 +0000 (UTC) X-FDA: 78895285686.18.0C48290 Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-eopbgr120048.outbound.protection.outlook.com [40.107.12.48]) by imf04.hostedemail.com (Postfix) with ESMTP id 0227A4000B for ; Wed, 8 Dec 2021 17:18:22 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hzsvTZn30WXb6aixkWSi5ZhEt5rIEuUhKMbDqnBnraNXS0V8RkkN/FPwy+OfdvYU3izFNwtkKKERZ9X7iSo4FcuxSfsMRYwNft4r/nomBUvd4eQISl+TuIN59Uaxvi5Ndc/CQwMSeqlMSWh3tywZSj3IYv9gQDvryP9dCqrobq4+qkrJJ2q08EvJQs+MHfr+3XzkxsM+3YhpTcTFx6EREJIjaf1ST3OGqJW4qs9kzlWemQsZ2UaRrGOfVC47P1awF8zZ+DvYe6Z8k1xTcKmLRW0Cs3oUmcSF1VknHTCVgWP3OMRcAhvbrcNw2Dx23vYMlcKTf6fuwlc37ylp6hd+/A== 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=Kal8uZy0vwBrMzZSbVRzSwNCiz8HNSzE2KXYS2+awQQ=; b=BjHkaUq7qwvTwTPEnOoUlVxTAspEUXlMQlyUfF7mc9L9yggT6KJFJATukZTEzI3pYO/EjQ6aq602SNf3UBtcD4pMlIIy8Ml1VGWDTwXbz8T50TgAfA/SSV9xYJK60qfj1wfQYeeciAjyKeT9K1Z6LnRwfob58GuSzIBlTIWRs3gNQkf8WL4fy+eLbEMCnXa3y9VQBFiCCp+tZcsYfwomllJJX6HfcJkSO3Cx0Tbu2NhOABLQiDJrXxYcHCS6OGqbVxdTN7QF+NDQTgG6dDbLltryFBurObDO3Dp4iSYX8x7EiP0EYX45H/0tGMs1c2xZ4CYCOzktDajk/pYSeRpj/w== 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 MR2P264MB0228.FRAP264.PROD.OUTLOOK.COM (2603:10a6:500:d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.12; Wed, 8 Dec 2021 17:18:19 +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.4755.022; Wed, 8 Dec 2021 17:18:19 +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" , Nicholas Piggin Subject: [PATCH v4 04/10] powerpc/mm: Make slice specific to book3s/64 Thread-Topic: [PATCH v4 04/10] powerpc/mm: Make slice specific to book3s/64 Thread-Index: AQHX7FeYbuPGOcS7MUOB41b1rsfSXw== Date: Wed, 8 Dec 2021 17:18:19 +0000 Message-ID: <47948d4b1e2195ffbfc59c9962d7eb9951af716e.1638976229.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: 11a6172f-94d3-43fa-e6be-08d9ba6ebadb x-ms-traffictypediagnostic: MR2P264MB0228: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: YNvbJUzXLjGDFsVQgptEJ4qDpXySZbBJze5OPdexgXOOi1HJcqOgbrYgwu0G9WY38dJM/j9hVjhzP6Z7mRQIPD5gQPit1ltikRUwaEsAAqMIte29/aPGJhHQ79hYJSD0tr5IHvfoZv4R0N3vtHPv2BKGNjK9cf6D8+xIDT9mbVvMmqUlMv8ixnPZIarvl3fm3fTZ6fIDUIRXpkQBgSbH/ymlFRHQX5UKpKuTIvZniPKuD62Zt/XLJrcqxKt3sZ5390x4C8k0T4CFqwCnNTa/iPSW9YYEW04yzt9O84AlgLIp98ptFx9MVs7FH34iqNLWHMm9PNLTQGgEszX1vNNN3iw/mo4jbFBr3aF0SopC4GBasowVV2EtKAMKyC1xnQ838q4uLSmZ5ONAYLJUZ7QIyiJua7CUSfqgrRSM+ZlLRFtqImBNPtm+EpJOOH+Ft6pOAUPAvPkKgfzy4T9qQQpQ5NhgycOYE1fC29oDgQ0126EnvKteE6WU12bYcMUkykYYoAeGgg3KGzr5lBsOopUeDL9uN5zleIbtRCFGJa2vnoKJiq6xSoG2ttCL8KjlEfowdK2Dz8gcU04YHU5tQGyP3usQdxkm0dlH4/4zEEG48mVEiCWg2YhGTsumPwsxzSoWIosPMPqUNAa0Pmy8vKTBqKArWacYQ+hTQ6F8uBA/2UXHWPVIvp8xIyxGMImzwf2y23myMAor2ACw1ihrjz6YXjc66ZAYUHj5OQFdDLylAhg= 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)(2616005)(91956017)(76116006)(66946007)(122000001)(5660300002)(38100700002)(66476007)(44832011)(6512007)(64756008)(66446008)(6486002)(66556008)(8676002)(86362001)(4326008)(8936002)(54906003)(508600001)(36756003)(71200400001)(38070700005)(316002)(83380400001)(26005)(110136005)(6506007)(2906002)(186003)(32563001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?D72YcDrPXAk4WzLhloL+VLz?= =?iso-8859-1?q?+Qff1AbGMc7sZA7F4TlpKfGYJybXcpcsSsXh3L//9rQt6/7SGDOHMilj7kkl?= =?iso-8859-1?q?D3Xh0lmj9OUpW1KzV1M/aNY7sWadKqBPoHnBolqNXJk/EtJNcjqfFoCt92tX?= =?iso-8859-1?q?KyR06hB2+pxbYHIEPAaoiOKcSYLXs8F0XLftiNvBz6N5RmGs/GLFYyvjaUcY?= =?iso-8859-1?q?a8i9u7bMZ6oXY9n3xQxmXjPpFyeUGXXw8PzYc9S8eiQY55484mJl1PqVIo2n?= =?iso-8859-1?q?wT4CciSsuzpXWYAP7w5D1Feb8U/GseGnzb/xhjU37teElQtcHSoUNmNiAxIP?= =?iso-8859-1?q?tq63mBKulVL5Mk1rBPsLACo9lRI2RftAuFONc/PauFYqf8nEEqplnwHNVVH3?= =?iso-8859-1?q?1vshQ8XeuX4VS6fY7UDiJELSQVpVw8/DlV/6UaCPA7mkWxcpKS2voNXJldhY?= =?iso-8859-1?q?PCF9bp6pkYjk37nWBNjjDi3uLvf7XCnCBx3OmTI8ItcXTQKQjvvGozoUp0Fj?= =?iso-8859-1?q?1rYb9AO3ekE90pid2sJdf3LuA4bnOkUH9EQQ17fuVPelgh298SADCVJZcEhX?= =?iso-8859-1?q?2eGQnp7PbW9fkebY3kCpB0iASYPOu0oXxmNigAO//D4PSbpRp2WCaI3ltMvS?= =?iso-8859-1?q?2nUaepu7r4E5xlkb3l1At30kbovAi7zWIyj8sYcdjRmt7rCgOPseyNQCdZBd?= =?iso-8859-1?q?t6Mo0BPm16c63QGAi4fmE2dkV5WOYS8TtEvgN1cMzU97/fQppITaTFb14l4A?= =?iso-8859-1?q?Qm3nbqAcyDjZBPf/WdNLDyVyKfngQDD+7ilyi2htW8wW79ayyFZo937mM5zW?= =?iso-8859-1?q?rZtzTltohnhb8k+16nDL87PLXDl/5O2orPbuPTvZFnibEqwvWTWitrm/bwTg?= =?iso-8859-1?q?PhiwRrFJBF1MRjAcO8FARgbIdDKyLPzapz4DaBlf2GrpkOrgAORrXX4xU1q5?= =?iso-8859-1?q?fUKlXzOz4u2aAIOMppJZlpzMlYcGO3jU3OL9meN3grrDolu/AZNS4aB+pbFi?= =?iso-8859-1?q?oSHee5GqqBCFGMwvpsgfSR+QzRZkiTmPUYUaxECZDW6m4BW4me3DmYGcvYYY?= =?iso-8859-1?q?zmnfqvLAMPbeTEE81dwhbf43YJm8tplC7nQ00JjzChdcs/RRSYCK0FrvR8pu?= =?iso-8859-1?q?L4Py2kHHO/YCjF1zcIyXBejuoqwbLP87Wv+FY7lq8Qz/MJgK5j31DA+h02F0?= =?iso-8859-1?q?PPZDsmjepbehQ67ZgeWN2Gs9xTRa728D65N/siZ/Sm0HZR9CLBkORX7onwQh?= =?iso-8859-1?q?VgYdTFjvSUyd/cx08FFpf/tKjq3fDP1/DNolgMDiKLW53Z7EAJ+OfzJBkwCA?= =?iso-8859-1?q?BCqBodV8X47qUGpDtpFKqIjDsBptqKu0fMObwRgSNLW1kNSjIHQ8i+9tKMxa?= =?iso-8859-1?q?iWbBW6cDAa0gGxqQYzGmTFVkNTd9KUutSRn6YchmMXsBLx83GiCGvwATZmmV?= =?iso-8859-1?q?xD0N5HoOB4qToj9HupMB/q5lrOX/mP5B4ifNsDxO8QmayHxYlFvf43ZYlVcf?= =?iso-8859-1?q?Sj+t6hXY+TL9xqw0j/M9B4tI9WnWmyxi4ykzJpF9VzWW/ArLWi2HtCfGuN4S?= =?iso-8859-1?q?5WWLSSJy4IA7O882cdxSSbi4PlGep7cVDWW/izDVJ6k4U7vD7xRkXSoR7V/m?= =?iso-8859-1?q?1G8uRzv2IIPmJmyCV9f6CFudpWPjRZww2JEvJyDwSTejYnsUQmFgF1Xw5dCa?= =?iso-8859-1?q?uols3e9qd5oepIc9Vb3I4bPiDHucKw4prLnh/TBAb2DOBvRn87YHwPNiAr2z?= =?iso-8859-1?q?LerQ=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: 11a6172f-94d3-43fa-e6be-08d9ba6ebadb X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Dec 2021 17:18:19.3141 (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: GMNj1zEJd0y9IwzWAN7tkmoRgwEOCoZbBg+PJ61TcKRDAUoVRes4oe4xSGSYlvgLAkhb0Bwdd1FxnM4Gij2+/EyqS/K/+MAfGmVD4FuHpyQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MR2P264MB0228 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 0227A4000B X-Stat-Signature: youcuymndo5y4t4d431wqdiaxhxnetgs Authentication-Results: imf04.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf04.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 40.107.12.48 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu X-HE-Tag: 1638983902-940651 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 311281063d48..3359cf7c2a61 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 */