linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Paul Mackerras <paulus@samba.org>,
	Michael Ellerman <mpe@ellerman.id.au>,
	aneesh.kumar@linux.ibm.com
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v1 05/15] powerpc/mm: get rid of nohash/32/mmu.h and nohash/64/mmu.h
Date: Wed,  3 Apr 2019 20:06:17 +0000 (UTC)	[thread overview]
Message-ID: <5acb0d752bf5dd936ec9ae1050b81d21a5a535a0.1554321743.git.christophe.leroy@c-s.fr> (raw)
In-Reply-To: <cover.1554321743.git.christophe.leroy@c-s.fr>

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

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
 arch/powerpc/include/asm/nohash/32/mmu.h | 19 -------------------
 arch/powerpc/include/asm/nohash/64/mmu.h |  8 --------
 arch/powerpc/include/asm/nohash/mmu.h    | 16 ++++++++++++----
 3 files changed, 12 insertions(+), 31 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 <asm/nohash/32/mmu-40x.h>
-#elif defined(CONFIG_44x)
-/* 44x-style software loaded TLB */
-#include <asm/nohash/32/mmu-44x.h>
-#elif defined(CONFIG_PPC_BOOK3E_MMU)
-/* Freescale Book-E software loaded TLB or Book-3e (ISA 2.06+) MMU */
-#include <asm/nohash/mmu-book3e.h>
-#elif defined (CONFIG_PPC_8xx)
-/* Motorola/Freescale 8xx software loaded TLB */
-#include <asm/nohash/32/mmu-8xx.h>
-#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 87871d027b75..000000000000
--- a/arch/powerpc/include/asm/nohash/64/mmu.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _ASM_POWERPC_NOHASH_64_MMU_H_
-#define _ASM_POWERPC_NOHASH_64_MMU_H_
-
-/* Freescale Book-E software loaded TLB or Book-3e (ISA 2.06+) MMU */
-#include <asm/nohash/mmu-book3e.h>
-
-#endif /* _ASM_POWERPC_NOHASH_64_MMU_H_ */
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 <asm/nohash/64/mmu.h>
-#else
-#include <asm/nohash/32/mmu.h>
+#if defined(CONFIG_40x)
+/* 40x-style software loaded TLB */
+#include <asm/nohash/32/mmu-40x.h>
+#elif defined(CONFIG_44x)
+/* 44x-style software loaded TLB */
+#include <asm/nohash/32/mmu-44x.h>
+#elif defined(CONFIG_PPC_BOOK3E_MMU)
+/* Freescale Book-E software loaded TLB or Book-3e (ISA 2.06+) MMU */
+#include <asm/nohash/mmu-book3e.h>
+#elif defined (CONFIG_PPC_8xx)
+/* Motorola/Freescale 8xx software loaded TLB */
+#include <asm/nohash/32/mmu-8xx.h>
 #endif
 
 #endif /* _ASM_POWERPC_NOHASH_MMU_H_ */
-- 
2.13.3


  parent reply	other threads:[~2019-04-03 20:07 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-03 20:06 [PATCH v1 00/15] Refactor pgalloc stuff Christophe Leroy
2019-04-03 20:06 ` [PATCH v1 01/15] powerpc/mm: drop __bad_pte() Christophe Leroy
2019-04-03 20:06 ` [PATCH v1 02/15] powerpc/mm: define __pud_free_tlb() at all time on nohash/64 Christophe Leroy
2019-04-03 20:06 ` [PATCH v1 03/15] powerpc/mm: convert Book3E 64 to pte_fragment Christophe Leroy
2019-04-03 20:06 ` [PATCH v1 04/15] powerpc/mm: move pgtable_t in asm/mmu.h Christophe Leroy
2019-04-03 20:06 ` Christophe Leroy [this message]
2019-04-03 20:06 ` [PATCH v1 06/15] powerpc/Kconfig: select PPC_MM_SLICES from subarch type Christophe Leroy
2019-04-11  5:02   ` Aneesh Kumar K.V
2019-04-11  5:07     ` Aneesh Kumar K.V
2019-04-03 20:06 ` [PATCH v1 07/15] powerpc/book3e: move early_alloc_pgtable() to init section Christophe Leroy
2019-04-03 20:06 ` [PATCH v1 08/15] powerpc/mm: don't use pte_alloc_kernel() until slab is available on PPC32 Christophe Leroy
2019-04-03 20:06 ` [PATCH v1 09/15] powerpc/mm: inline pte_alloc_one_kernel() and pte_alloc_one() " Christophe Leroy
2019-04-03 20:06 ` [PATCH v1 10/15] powerpc/mm: refactor pte_alloc_one() and pte_free() families definition Christophe Leroy
2019-04-03 20:06 ` [PATCH v1 11/15] powerpc/mm: refactor definition of pgtable_cache[] Christophe Leroy
2019-04-03 20:06 ` [PATCH v1 12/15] powerpc/mm: Only keep one version of pmd_populate() functions on nohash/32 Christophe Leroy
2019-04-03 20:06 ` [PATCH v1 13/15] powerpc/mm: refactor pgtable freeing functions on nohash Christophe Leroy
2019-04-03 20:06 ` [PATCH v1 14/15] powerpc/mm: refactor pmd_pgtable() Christophe Leroy
2019-04-03 20:06 ` [PATCH v1 15/15] powerpc/mm: refactor pgd_alloc() and pgd_free() on nohash Christophe Leroy
2019-04-11  5:06 ` [PATCH v1 00/15] Refactor pgalloc stuff Aneesh Kumar K.V

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5acb0d752bf5dd936ec9ae1050b81d21a5a535a0.1554321743.git.christophe.leroy@c-s.fr \
    --to=christophe.leroy@c-s.fr \
    --cc=aneesh.kumar@linux.ibm.com \
    --cc=benh@kernel.crashing.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mpe@ellerman.id.au \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).