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

Commit 3541833f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Martin Schwidefsky:

 - A fix for the pgtable_bytes misaccounting on s390. The patch changes
   common code part in regard to page table folding and adds extra
   checks to mm_[inc|dec]_nr_[pmds|puds].

 - Add FORCE for all build targets using if_changed

 - Use non-loadable phdr for the .vmlinux.info section to avoid a
   segment overlap that confuses kexec

 - Cleanup the attribute definition for the diagnostic sampling

 - Increase stack size for CONFIG_KASAN=y builds

 - Export __node_distance to fix a build error

 - Correct return code of a PMU event init function

 - An update for the default configs

* tag 's390-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/perf: Change CPUM_CF return code in event init function
  s390: update defconfigs
  s390/mm: Fix ERROR: "__node_distance" undefined!
  s390/kasan: increase instrumented stack size to 64k
  s390/cpum_sf: Rework attribute definition for diagnostic sampling
  s390/mm: fix mis-accounting of pgtable_bytes
  mm: add mm_pxd_folded checks to pgtable_bytes accounting functions
  mm: introduce mm_[p4d|pud|pmd]_folded
  mm: make the __PAGETABLE_PxD_FOLDED defines non-empty
  s390: avoid vmlinux segments overlap
  s390/vdso: add missing FORCE to build targets
  s390/decompressor: add missing FORCE to build targets
parents 24ccea7e 0bb2ae1b

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

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#ifndef _ASM_PGTABLE_2LEVEL_H

#define _ASM_PGTABLE_2LEVEL_H



#define __PAGETABLE_PMD_FOLDED

#define __PAGETABLE_PMD_FOLDED 1



/*

 * Hardware-wise, we have a two level page table structure, where the first

arch/m68k/include/asm/pgtable_mm.h

+2 −2
Original line number Diff line number Diff line
@@ -55,12 +55,12 @@ 
 */

#ifdef CONFIG_SUN3

#define PTRS_PER_PTE   16

#define __PAGETABLE_PMD_FOLDED

#define __PAGETABLE_PMD_FOLDED 1

#define PTRS_PER_PMD   1

#define PTRS_PER_PGD   2048

#elif defined(CONFIG_COLDFIRE)

#define PTRS_PER_PTE	512

#define __PAGETABLE_PMD_FOLDED

#define __PAGETABLE_PMD_FOLDED 1

#define PTRS_PER_PMD	1

#define PTRS_PER_PGD	1024

#else

arch/microblaze/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ extern int mem_init_done; 


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



#define __PAGETABLE_PMD_FOLDED

#define __PAGETABLE_PMD_FOLDED 1



#ifdef __KERNEL__

#ifndef __ASSEMBLY__

arch/nds32/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#ifndef _ASMNDS32_PGTABLE_H

#define _ASMNDS32_PGTABLE_H



#define __PAGETABLE_PMD_FOLDED

#define __PAGETABLE_PMD_FOLDED 1

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

#include <asm-generic/sizes.h>

arch/parisc/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr) 
#if CONFIG_PGTABLE_LEVELS == 3

#define BITS_PER_PMD	(PAGE_SHIFT + PMD_ORDER - BITS_PER_PMD_ENTRY)

#else

#define __PAGETABLE_PMD_FOLDED

#define __PAGETABLE_PMD_FOLDED 1

#define BITS_PER_PMD	0

#endif

#define PTRS_PER_PMD    (1UL << BITS_PER_PMD)