Commit 6e117330 authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'for-next/misc' into for-next/core 

* for-next/misc:
  arm64: Remove duplicate included header
  arm64/Kconfig: Drop EXECMEM dependency from ARCH_WANTS_EXECMEM_LATE
  arm64: asm: Fix typo in pgtable.h
  arm64/mm: Ensure adequate HUGE_MAX_HSTATE
  arm64/mm: Replace open encodings with PXD_TABLE_BIT
  arm64/mm: Drop INIT_MM_CONTEXT()
parents e190227b 965e9bbe

arch/arm64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ config ARM64 
	select ARCH_WANT_FRAME_POINTERS

	select ARCH_WANT_HUGE_PMD_SHARE if ARM64_4K_PAGES || (ARM64_16K_PAGES && !ARM64_VA_BITS_36)

	select ARCH_WANT_LD_ORPHAN_WARN

	select ARCH_WANTS_EXECMEM_LATE if EXECMEM

	select ARCH_WANTS_EXECMEM_LATE

	select ARCH_WANTS_NO_INSTR

	select ARCH_WANTS_THP_SWAP if ARM64_4K_PAGES

	select ARCH_HAS_UBSAN

arch/arm64/include/asm/mmu.h

+0 −3
Original line number Diff line number Diff line
@@ -109,8 +109,5 @@ static inline bool kaslr_requires_kpti(void) 
	return true;

}



#define INIT_MM_CONTEXT(name)	\

	.pgd = swapper_pg_dir,



#endif	/* !__ASSEMBLY__ */

#endif

arch/arm64/include/asm/pgtable.h

+3 −3
Original line number Diff line number Diff line
@@ -896,7 +896,7 @@ static inline bool mm_pud_folded(const struct mm_struct *mm) 
	pr_err("%s:%d: bad pud %016llx.\n", __FILE__, __LINE__, pud_val(e))



#define p4d_none(p4d)		(pgtable_l4_enabled() && !p4d_val(p4d))

#define p4d_bad(p4d)		(pgtable_l4_enabled() && !(p4d_val(p4d) & 2))

#define p4d_bad(p4d)		(pgtable_l4_enabled() && !(p4d_val(p4d) & P4D_TABLE_BIT))

#define p4d_present(p4d)	(!p4d_none(p4d))



static inline void set_p4d(p4d_t *p4dp, p4d_t p4d)
@@ -1023,7 +1023,7 @@ static inline bool mm_p4d_folded(const struct mm_struct *mm) 
	pr_err("%s:%d: bad p4d %016llx.\n", __FILE__, __LINE__, p4d_val(e))



#define pgd_none(pgd)		(pgtable_l5_enabled() && !pgd_val(pgd))

#define pgd_bad(pgd)		(pgtable_l5_enabled() && !(pgd_val(pgd) & 2))

#define pgd_bad(pgd)		(pgtable_l5_enabled() && !(pgd_val(pgd) & PGD_TABLE_BIT))

#define pgd_present(pgd)	(!pgd_none(pgd))



static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
@@ -1345,7 +1345,7 @@ static inline void ___ptep_set_wrprotect(struct mm_struct *mm, 
}



/*

 * __ptep_set_wrprotect - mark read-only while trasferring potential hardware

 * __ptep_set_wrprotect - mark read-only while transferring potential hardware

 * dirty status (PTE_DBM && !PTE_RDONLY) to the software PTE_DIRTY bit.

 */

static inline void __ptep_set_wrprotect(struct mm_struct *mm,

arch/arm64/include/asm/seccomp.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#define SECCOMP_ARCH_NATIVE_NR		NR_syscalls

#define SECCOMP_ARCH_NATIVE_NAME	"aarch64"

#ifdef CONFIG_COMPAT

#include <asm/unistd_compat_32.h>

# define SECCOMP_ARCH_COMPAT		AUDIT_ARCH_ARM

# define SECCOMP_ARCH_COMPAT_NR		__NR_compat32_syscalls

# define SECCOMP_ARCH_COMPAT_NAME	"arm"

arch/arm64/mm/hugetlbpage.c

+12 −0
Original line number Diff line number Diff line
@@ -519,6 +519,18 @@ pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, 


static int __init hugetlbpage_init(void)

{

	/*

	 * HugeTLB pages are supported on maximum four page table

	 * levels (PUD, CONT PMD, PMD, CONT PTE) for a given base

	 * page size, corresponding to hugetlb_add_hstate() calls

	 * here.

	 *

	 * HUGE_MAX_HSTATE should at least match maximum supported

	 * HugeTLB page sizes on the platform. Any new addition to

	 * supported HugeTLB page sizes will also require changing

	 * HUGE_MAX_HSTATE as well.

	 */

	BUILD_BUG_ON(HUGE_MAX_HSTATE < 4);

	if (pud_sect_supported())

		hugetlb_add_hstate(PUD_SHIFT - PAGE_SHIFT);