Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a792d5d authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/mm: get rid of nohash/32/mmu.h and nohash/64/mmu.h 



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: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 696dffa2

arch/powerpc/include/asm/nohash/32/mmu.h

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
/* 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_ */

arch/powerpc/include/asm/nohash/64/mmu.h

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
/* 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 <asm/nohash/mmu-book3e.h>



#endif /* _ASM_POWERPC_NOHASH_64_MMU_H_ */

arch/powerpc/include/asm/nohash/mmu-book3e.h

+2 −0
Original line number Diff line number Diff line
@@ -306,6 +306,8 @@ extern int book3e_htw_mode; 


#define mmu_cleanup_all NULL



#define MAX_PHYSMEM_BITS        44



#endif



#endif /* !__ASSEMBLY__ */

arch/powerpc/include/asm/nohash/mmu.h

+12 −4
Original line number Diff line number Diff line
@@ -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_ */