Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp801134yba; Fri, 26 Apr 2019 08:59:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqxmfm76tOM4v6RS0W/jFgsRLZ/ve1r/d1UXR4zhSp5t19LH7XwtDy/HkRcQWQXxGSSRWB8G X-Received: by 2002:a63:5c56:: with SMTP id n22mr45173938pgm.108.1556294366734; Fri, 26 Apr 2019 08:59:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556294366; cv=none; d=google.com; s=arc-20160816; b=HGeODLwComaY0Z9FEZUXUKkADsCaAm1+9FCo6mJFlrqs9et9FiLq7rN4BLv+5EX5ct 1w5uIMl+CvOr3vm4inmrZE32NHp2/ylmSn3E3EPbi+NsViZ9Ptn2BFP9PKLCMFRtz2yH uOR8UVQgGSXV+lSLG2Ut/i+5LCa/MP1OWlI9WRbpgk8SvCwKi6yZUBBIDGOmZsIntK35 XA8MUgwzBh9P9tqGetik6pQjajeZDc9ibKzbuIBEIRqePG044QJPgeITb+XEn9b6eqzg TSJfeZgwn4wspn1DF6DxArk9bUzEcXFqRte+fz94HwlFDOv1Thu84IEQuoKnE3oCVJqf Dv8w== 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:references :in-reply-to:message-id:dkim-signature; bh=2R6JBZSMWuXKlmIqHwURs8rqGPIdbTZlXIFflcVs62M=; b=mmgTEw6/hgEX7bC2ALyODdPApWyU/l2zqrpEYXJMl3KSbcM34yhpsa63UJ/Dnzxi1y Ibx7IkB7GCOFcPbdoEzd4vkE1OG/w1CbfpFnfIojxspdBJFDfou6WK5OyzpbYaaOjXmD 2ENtPsV4UBHAWx8icyTfEYwq6D7Lxfx03dNJCyLIs8HVXCzi6AcFIH2u+LCLdAlHPfPG VuoPRaCGWz+vrH3nVKDhiLrClNydheLMsjmmbxxLwQfk81oqKI+ZF3iV9v5JIL0IZmxq QKoz7kZzjdjITxd0FPZKm+GtZBhaEes43LSHDJNDTUgAiisIDck9RJKlHzOjBoyCRryl 4GNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=mEyb21lX; 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 t13si23787016pgp.569.2019.04.26.08.59.11; Fri, 26 Apr 2019 08:59:26 -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=mEyb21lX; 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 S1726597AbfDZP6I (ORCPT + 99 others); Fri, 26 Apr 2019 11:58:08 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:14230 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726462AbfDZP6F (ORCPT ); Fri, 26 Apr 2019 11:58:05 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 44rJcB29ynz9v0yV; Fri, 26 Apr 2019 17:58:02 +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=mEyb21lX; 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 byMrXevU5eM9; Fri, 26 Apr 2019 17:58:02 +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 44rJcB12LFz9v0yT; Fri, 26 Apr 2019 17:58:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1556294282; bh=2R6JBZSMWuXKlmIqHwURs8rqGPIdbTZlXIFflcVs62M=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=mEyb21lXQRATT20VbwMTmQVSCFGCvbrhBBKs+ib+kJBKThVrWtgw/PNBPcbQ/u+TU wL9qtYIp1kHIJeM6Y4gKmfaVFGDIC6dfVv1IxIVMFnCpSKGsrRvVdKsD18iBPtmWXU LNYN6h2H+hsP1C2q0G2P8ttohl9Z98LFBoWImpVY= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id BF4E38B94A; Fri, 26 Apr 2019 17:58:03 +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 4noG9NxAZVoJ; Fri, 26 Apr 2019 17:58:03 +0200 (CEST) Received: from po16846vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.231.6]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 9CC048B82F; Fri, 26 Apr 2019 17:58:03 +0200 (CEST) Received: by po16846vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 8B7C1666FE; Fri, 26 Apr 2019 15:58:03 +0000 (UTC) Message-Id: <371bbb2a4c61907b12d025b9beac4576ec7c9c44.1556293738.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v2 05/15] powerpc/mm: get rid of nohash/32/mmu.h and nohash/64/mmu.h To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , aneesh.kumar@linux.ibm.com Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Fri, 26 Apr 2019 15:58:03 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Those files have no real added values, especially the 64 bit which only includes the common book3e mmu.h which is also included from 32 bits side. So lets do the final inclusion directly from nohash/mmu.h Reviewed-by: Aneesh Kumar K.V Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/nohash/32/mmu.h | 19 ------------------- arch/powerpc/include/asm/nohash/64/mmu.h | 10 ---------- arch/powerpc/include/asm/nohash/mmu-book3e.h | 2 ++ arch/powerpc/include/asm/nohash/mmu.h | 16 ++++++++++++---- 4 files changed, 14 insertions(+), 33 deletions(-) delete mode 100644 arch/powerpc/include/asm/nohash/32/mmu.h delete mode 100644 arch/powerpc/include/asm/nohash/64/mmu.h diff --git a/arch/powerpc/include/asm/nohash/32/mmu.h b/arch/powerpc/include/asm/nohash/32/mmu.h deleted file mode 100644 index af0e8b54876a..000000000000 --- a/arch/powerpc/include/asm/nohash/32/mmu.h +++ /dev/null @@ -1,19 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_POWERPC_NOHASH_32_MMU_H_ -#define _ASM_POWERPC_NOHASH_32_MMU_H_ - -#if defined(CONFIG_40x) -/* 40x-style software loaded TLB */ -#include -#elif defined(CONFIG_44x) -/* 44x-style software loaded TLB */ -#include -#elif defined(CONFIG_PPC_BOOK3E_MMU) -/* Freescale Book-E software loaded TLB or Book-3e (ISA 2.06+) MMU */ -#include -#elif defined (CONFIG_PPC_8xx) -/* Motorola/Freescale 8xx software loaded TLB */ -#include -#endif - -#endif /* _ASM_POWERPC_NOHASH_32_MMU_H_ */ diff --git a/arch/powerpc/include/asm/nohash/64/mmu.h b/arch/powerpc/include/asm/nohash/64/mmu.h deleted file mode 100644 index e490ecdac012..000000000000 --- a/arch/powerpc/include/asm/nohash/64/mmu.h +++ /dev/null @@ -1,10 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_POWERPC_NOHASH_64_MMU_H_ -#define _ASM_POWERPC_NOHASH_64_MMU_H_ - -#define MAX_PHYSMEM_BITS 44 - -/* Freescale Book-E software loaded TLB or Book-3e (ISA 2.06+) MMU */ -#include - -#endif /* _ASM_POWERPC_NOHASH_64_MMU_H_ */ diff --git a/arch/powerpc/include/asm/nohash/mmu-book3e.h b/arch/powerpc/include/asm/nohash/mmu-book3e.h index e20072972e35..4c9777d256fb 100644 --- a/arch/powerpc/include/asm/nohash/mmu-book3e.h +++ b/arch/powerpc/include/asm/nohash/mmu-book3e.h @@ -306,6 +306,8 @@ extern int book3e_htw_mode; #define mmu_cleanup_all NULL +#define MAX_PHYSMEM_BITS 44 + #endif #endif /* !__ASSEMBLY__ */ diff --git a/arch/powerpc/include/asm/nohash/mmu.h b/arch/powerpc/include/asm/nohash/mmu.h index a037cb1efb57..edc793e5f08f 100644 --- a/arch/powerpc/include/asm/nohash/mmu.h +++ b/arch/powerpc/include/asm/nohash/mmu.h @@ -2,10 +2,18 @@ #ifndef _ASM_POWERPC_NOHASH_MMU_H_ #define _ASM_POWERPC_NOHASH_MMU_H_ -#ifdef CONFIG_PPC64 -#include -#else -#include +#if defined(CONFIG_40x) +/* 40x-style software loaded TLB */ +#include +#elif defined(CONFIG_44x) +/* 44x-style software loaded TLB */ +#include +#elif defined(CONFIG_PPC_BOOK3E_MMU) +/* Freescale Book-E software loaded TLB or Book-3e (ISA 2.06+) MMU */ +#include +#elif defined (CONFIG_PPC_8xx) +/* Motorola/Freescale 8xx software loaded TLB */ +#include #endif #endif /* _ASM_POWERPC_NOHASH_MMU_H_ */ -- 2.13.3