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

Commit baeedc71 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'prep-for-5level' 

Merge 5-level page table prep from Kirill Shutemov:
 "Here's relatively low-risk part of 5-level paging patchset. Merging it
  now will make x86 5-level paging enabling in v4.12 easier.

  The first patch is actually x86-specific: detect 5-level paging
  support. It boils down to single define.

  The rest of patchset converts Linux MMU abstraction from 4- to 5-level
  paging.

  Enabling of new abstraction in most cases requires adding single line
  of code in arch-specific code. The rest is taken care by asm-generic/.

  Changes to mm/ code are mostly mechanical: add support for new page
  table level -- p4d_t -- where we deal with pud_t now.

  v2:
   - fix build on microblaze (Michal);
   - comment for __ARCH_HAS_5LEVEL_HACK in kasan_populate_zero_shadow();
   - acks from Michal"

* emailed patches from Kirill A Shutemov <kirill.shutemov@linux.intel.com>:
  mm: introduce __p4d_alloc()
  mm: convert generic code to 5-level paging
  asm-generic: introduce <asm-generic/pgtable-nop4d.h>
  arch, mm: convert all architectures to use 5level-fixup.h
  asm-generic: introduce __ARCH_USE_5LEVEL_HACK
  asm-generic: introduce 5level-fixup.h
  x86/cpufeature: Add 5-level paging detection
parents 8fe3ccae 90eceff1

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>



/*