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

Commit 9849a569 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

arch, mm: convert all architectures to use 5level-fixup.h 



If an architecture uses 4level-fixup.h we don't need to do anything as
it includes 5level-fixup.h.

If an architecture uses pgtable-nop*d.h, define __ARCH_USE_5LEVEL_HACK
before inclusion of the header. It makes asm-generic code to use
5level-fixup.h.

If an architecture has 4-level paging or folds levels on its own,
include 5level-fixup.h directly.

Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 30ec8426

arch/arc/include/asm/hugepage.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#define _ASM_ARC_HUGEPAGE_H



#include <linux/types.h>

#define __ARCH_USE_5LEVEL_HACK

#include <asm-generic/pgtable-nopmd.h>



static inline pte_t pmd_pte(pmd_t pmd)

arch/arc/include/asm/pgtable.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 


#include <asm/page.h>

#include <asm/mmu.h>

#define __ARCH_USE_5LEVEL_HACK

#include <asm-generic/pgtable-nopmd.h>

#include <linux/const.h>

arch/arm/include/asm/pgtable.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#else



#define __ARCH_USE_5LEVEL_HACK

#include <asm-generic/pgtable-nopud.h>

#include <asm/memory.h>

#include <asm/pgtable-hwdef.h>

arch/arm64/include/asm/pgtable-types.h

+4 −0
Original line number Diff line number Diff line
@@ -55,9 +55,13 @@ typedef struct { pteval_t pgprot; } pgprot_t; 
#define __pgprot(x)	((pgprot_t) { (x) } )



#if CONFIG_PGTABLE_LEVELS == 2

#define __ARCH_USE_5LEVEL_HACK

#include <asm-generic/pgtable-nopmd.h>

#elif CONFIG_PGTABLE_LEVELS == 3

#define __ARCH_USE_5LEVEL_HACK

#include <asm-generic/pgtable-nopud.h>

#elif CONFIG_PGTABLE_LEVELS == 4

#include <asm-generic/5level-fixup.h>

#endif



#endif	/* __ASM_PGTABLE_TYPES_H */

arch/avr32/include/asm/pgtable-2level.h

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#ifndef __ASM_AVR32_PGTABLE_2LEVEL_H

#define __ASM_AVR32_PGTABLE_2LEVEL_H



#define __ARCH_USE_5LEVEL_HACK

#include <asm-generic/pgtable-nopmd.h>



/*