Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1902607yba; Thu, 25 Apr 2019 07:32:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqyIjF/p0dnuFrMeOJkpMWObgsZk1VAsPczhIMdWrEEyItDs0IXwWfxn2anYfb7yj6Wzltqc X-Received: by 2002:aa7:8458:: with SMTP id r24mr21693453pfn.231.1556202761369; Thu, 25 Apr 2019 07:32:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556202761; cv=none; d=google.com; s=arc-20160816; b=nIts1GeiqeDktPFYr+QW8UI1KGeRXATiFppuLo2LPwySXlWoVafF9gmUozVn5ohO19 wUWN7dkgKXvNYuRqA2ZHoCPEo5zzV4vN5eC1el6zJf4sfFGAxg1PIftXPyG0dwn+MjqW YxrprDwAHuhHYnqpO3sm7JdGIoC64EYdo7WdG1Xxvszfw2GtcHw7/an1SAgRprjqHZwt xmE+URxpl9TIDXlTq7X3ikh7x+VrezGwCbdB5dcuCc1OCeUfrL8t+fyvdmwbhLsJZX6/ TO0V8sWcCVGy2PjsTUcmON3k5RKn24j2+4vV8BpjVabsZG0YQ777kFTgKpITIEOBpwct Wv/w== 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:message-id :dkim-signature; bh=ZAk5oInFteIZFLfsYCErnhXj4xJ5HcEpKVF+oTA5mHo=; b=SccnShVeaQyLABdUNN0ku1toRGqQNlp8pQgZCf8z8c8W39/dmqhelgNAY5apd1snfY Bc5K5/7C7iASKulnZkpXh7EMG07dBQ4TRkG0CxO0puujYLpP72yB/6prmGDtg1RSX4gG D9txyoL0p0Ai0MW+iS/XhxjtRdLKfiruuGBrGyeHuL+C3pkyOfk2a3vhe2F4hWc+v5Gz Sj7Crf1MWnBBrXq6XGW3tGMVn0VG5aYqXchNDN4fVOlNTLjPco6wRolDxj45sSbJRoRP Vb4gdLsWAW7hhUO3kKU94+AfJ1YKKQqI61Rgqq7UwkjyDkT5ZmV9PAHQNgQ6eaVzSeEA I8uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b="pExlI/QS"; 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 196si21187361pgb.295.2019.04.25.07.32.24; Thu, 25 Apr 2019 07:32:41 -0700 (PDT) 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; dkim=pass header.i=@c-s.fr header.s=mail header.b="pExlI/QS"; 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 S1727556AbfDYO32 (ORCPT + 99 others); Thu, 25 Apr 2019 10:29:28 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:29332 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725937AbfDYO32 (ORCPT ); Thu, 25 Apr 2019 10:29:28 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 44qfhP5GCMz9v06X; Thu, 25 Apr 2019 16:29:25 +0200 (CEST) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=pExlI/QS; dkim-adsp=pass; dkim-atps=neutral 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 V_UJf2bk2lNM; Thu, 25 Apr 2019 16:29:25 +0200 (CEST) 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 44qfhP3ppvz9v06V; Thu, 25 Apr 2019 16:29:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1556202565; bh=ZAk5oInFteIZFLfsYCErnhXj4xJ5HcEpKVF+oTA5mHo=; h=From:Subject:To:Cc:Date:From; b=pExlI/QSxTsT5a/b0I+Iga4XMKht5bLQs2e5x9FFnamAj2c/FCkoZpkhFGfCbf2fJ RkFqNMLBSlYe2lYx/FxzJtDZkc9ANmikQL6cE7nh4UcY0ZiCNPJhlNiHNqJqBJiZ+f Ykwn2pYBCpFK6bl/LyTi8UUf+SGzlShAxrvXN9dU= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 1A4518B931; Thu, 25 Apr 2019 16:29:27 +0200 (CEST) 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 vHbBjXE-_eMi; Thu, 25 Apr 2019 16:29:27 +0200 (CEST) Received: from po16846vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id E835A8B923; Thu, 25 Apr 2019 16:29:26 +0200 (CEST) Received: by po16846vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 89E4266276; Thu, 25 Apr 2019 14:29:26 +0000 (UTC) Message-Id: From: Christophe Leroy Subject: [PATCH v2 00/11] Reduce ifdef mess in slice.c To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , aneesh.kumar@linux.ibm.com Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Thu, 25 Apr 2019 14:29:26 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This series is a split out of the v1 series "Reduce ifdef mess in hugetlbpage.c and slice.c". It is also rebased after the series from Aneesh to reduce context size for Radix. See http://kisskb.ellerman.id.au/kisskb/branch/chleroy/head/f263887b4ca31f4bb0fe77823e301c28ba27c796/ for wide compilation. Christophe Leroy (11): powerpc/mm: fix erroneous duplicate slb_addr_limit init powerpc/mm: no slice for nohash/64 powerpc/mm: hand a context_t over to slice_mask_for_size() instead of mm_struct powerpc/mm: move slice_mask_for_size() into mmu.h powerpc/mm: get rid of mm_ctx_slice_mask_xxx() powerpc/mm: remove unnecessary #ifdef CONFIG_PPC64 powerpc/mm: remove a couple of #ifdef CONFIG_PPC_64K_PAGES in mm/slice.c powerpc/8xx: get rid of #ifdef CONFIG_HUGETLB_PAGE for slices powerpc/mm: define get_slice_psize() all the time powerpc/mm: define subarch SLB_ADDR_LIMIT_DEFAULT powerpc/mm: drop slice DEBUG arch/powerpc/include/asm/book3s/64/mmu.h | 29 +++--- arch/powerpc/include/asm/book3s/64/slice.h | 2 + arch/powerpc/include/asm/nohash/32/mmu-8xx.h | 51 +++++------ arch/powerpc/include/asm/nohash/32/slice.h | 2 + arch/powerpc/include/asm/nohash/64/slice.h | 12 --- arch/powerpc/include/asm/slice.h | 9 +- arch/powerpc/kernel/setup-common.c | 6 -- arch/powerpc/mm/hash_utils_64.c | 2 +- arch/powerpc/mm/hugetlbpage.c | 4 +- arch/powerpc/mm/slice.c | 132 ++++----------------------- arch/powerpc/mm/tlb_nohash.c | 4 +- arch/powerpc/platforms/Kconfig.cputype | 4 + 12 files changed, 69 insertions(+), 188 deletions(-) delete mode 100644 arch/powerpc/include/asm/nohash/64/slice.h -- 2.13.3