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

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

powerpc/mm: Get rid of pte-common.h 



Do not include pte-common.h in nohash/32/pgtable.h

As that was the last includer, get rid of pte-common.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 cbcbbf4a

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

+24 −2
Original line number Diff line number Diff line
@@ -128,8 +128,30 @@ extern int icache_44x_need_flush; 
#include <asm/nohash/32/pte-8xx.h>

#endif



/* And here we include common definitions */

#include <asm/pte-common.h>

/*

 * Location of the PFN in the PTE. Most 32-bit platforms use the same

 * as _PAGE_SHIFT here (ie, naturally aligned).

 * Platform who don't just pre-define the value so we don't override it here.

 */

#ifndef PTE_RPN_SHIFT

#define PTE_RPN_SHIFT	(PAGE_SHIFT)

#endif



/*

 * The mask covered by the RPN must be a ULL on 32-bit platforms with

 * 64-bit PTEs.

 */

#if defined(CONFIG_PPC32) && defined(CONFIG_PTE_64BIT)

#define PTE_RPN_MASK	(~((1ULL << PTE_RPN_SHIFT) - 1))

#else

#define PTE_RPN_MASK	(~((1UL << PTE_RPN_SHIFT) - 1))

#endif



/*

 * _PAGE_CHG_MASK masks of bits that are to be preserved across

 * pgprot changes.

 */

#define _PAGE_CHG_MASK	(PTE_RPN_MASK | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_SPECIAL)



#ifndef __ASSEMBLY__

arch/powerpc/include/asm/pte-common.h

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Included from asm/pgtable-*.h only ! */



/* Location of the PFN in the PTE. Most 32-bit platforms use the same

 * as _PAGE_SHIFT here (ie, naturally aligned).

 * Platform who don't just pre-define the value so we don't override it here

 */

#ifndef PTE_RPN_SHIFT

#define PTE_RPN_SHIFT	(PAGE_SHIFT)

#endif



/* The mask covered by the RPN must be a ULL on 32-bit platforms with

 * 64-bit PTEs

 */

#if defined(CONFIG_PPC32) && defined(CONFIG_PTE_64BIT)

#define PTE_RPN_MASK	(~((1ULL<<PTE_RPN_SHIFT)-1))

#else

#define PTE_RPN_MASK	(~((1UL<<PTE_RPN_SHIFT)-1))

#endif



/* _PAGE_CHG_MASK masks of bits that are to be preserved across

 * pgprot changes

 */

#define _PAGE_CHG_MASK	(PTE_RPN_MASK | _PAGE_DIRTY | \

                         _PAGE_ACCESSED | _PAGE_SPECIAL)