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

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

Merge branch 'akpm' (patches from Andrew) 

Mergr misc fixes from Andrew Morton:
 "28 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (28 commits)
  fs/hugetlbfs/inode.c: change put_page/unlock_page order in hugetlbfs_fallocate()
  mm/hugetlb: fix NULL-pointer dereference on 5-level paging machine
  autofs: revert "autofs: fix AT_NO_AUTOMOUNT not being honored"
  autofs: revert "autofs: take more care to not update last_used on path walk"
  fs/fat/inode.c: fix sb_rdonly() change
  mm, memcg: fix mem_cgroup_swapout() for THPs
  mm: migrate: fix an incorrect call of prep_transhuge_page()
  kmemleak: add scheduling point to kmemleak_scan()
  scripts/bloat-o-meter: don't fail with division by 0
  fs/mbcache.c: make count_objects() more robust
  Revert "mm/page-writeback.c: print a warning if the vm dirtiness settings are illogical"
  mm/madvise.c: fix madvise() infinite loop under special circumstances
  exec: avoid RLIMIT_STACK races with prlimit()
  IB/core: disable memory registration of filesystem-dax vmas
  v4l2: disable filesystem-dax mapping support
  mm: fail get_vaddr_frames() for filesystem-dax mappings
  mm: introduce get_user_pages_longterm
  device-dax: implement ->split() to catch invalid munmap attempts
  mm, hugetlbfs: introduce ->split() to vm_operations_struct
  scripts/faddr2line: extend usage on generic arch
  ...
parents b9151761 72639e6d

Documentation/sysctl/vm.txt

+0 −7
Original line number Diff line number Diff line
@@ -158,10 +158,6 @@ Note: the minimum value allowed for dirty_bytes is two pages (in bytes); any 
value lower than this limit will be ignored and the old configuration will be

retained.



Note: the value of dirty_bytes also must be set greater than

dirty_background_bytes or the amount of memory corresponding to

dirty_background_ratio.



==============================================================



dirty_expire_centisecs
@@ -181,9 +177,6 @@ generating disk writes will itself start writing out dirty data. 


The total available memory is not equal to total system memory.



Note: dirty_ratio must be set greater than dirty_background_ratio or

ratio corresponding to dirty_background_bytes.



==============================================================



dirty_writeback_centisecs

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

+0 −1
Original line number Diff line number Diff line
@@ -221,7 +221,6 @@ static inline pte_t pte_mkspecial(pte_t pte) 
}

#define	__HAVE_ARCH_PTE_SPECIAL



#define __HAVE_ARCH_PMD_WRITE

#define pmd_write(pmd)		(pmd_isclear((pmd), L_PMD_SECT_RDONLY))

#define pmd_dirty(pmd)		(pmd_isset((pmd), L_PMD_SECT_DIRTY))

#define pud_page(pud)		pmd_page(__pmd(pud_val(pud)))

arch/arm64/include/asm/pgtable.h

+0 −1
Original line number Diff line number Diff line
@@ -345,7 +345,6 @@ static inline int pmd_protnone(pmd_t pmd) 


#define pmd_thp_or_huge(pmd)	(pmd_huge(pmd) || pmd_trans_huge(pmd))



#define __HAVE_ARCH_PMD_WRITE

#define pmd_write(pmd)		pte_write(pmd_pte(pmd))



#define pmd_mkhuge(pmd)		(__pmd(pmd_val(pmd) & ~PMD_TABLE_BIT))

arch/mips/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ static inline pmd_t pmd_mkhuge(pmd_t pmd) 
extern void set_pmd_at(struct mm_struct *mm, unsigned long addr,

		       pmd_t *pmdp, pmd_t pmd);



#define __HAVE_ARCH_PMD_WRITE

#define pmd_write pmd_write

static inline int pmd_write(pmd_t pmd)

{

	return !!(pmd_val(pmd) & _PAGE_WRITE);

arch/powerpc/include/asm/book3s/64/pgtable.h

+0 −1
Original line number Diff line number Diff line
@@ -1005,7 +1005,6 @@ static inline int pmd_protnone(pmd_t pmd) 
}

#endif /* CONFIG_NUMA_BALANCING */



#define __HAVE_ARCH_PMD_WRITE

#define pmd_write(pmd)		pte_write(pmd_pte(pmd))

#define __pmd_write(pmd)	__pte_write(pmd_pte(pmd))

#define pmd_savedwrite(pmd)	pte_savedwrite(pmd_pte(pmd))