From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 27 Oct 2018 02:33:41 +0000 (-0700)
Subject: Merge branch 'akpm' (patches from Andrew)
X-Git-Tag: v5.15~7719
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=345671ea0f9258f410eb057b9ced9cefbbe5dc78;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'akpm' (patches from Andrew)

Merge updates from Andrew Morton:

 - a few misc things

 - ocfs2 updates

 - most of MM

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (132 commits)
  hugetlbfs: dirty pages as they are added to pagecache
  mm: export add_swap_extent()
  mm: split SWP_FILE into SWP_ACTIVATED and SWP_FS
  tools/testing/selftests/vm/map_fixed_noreplace.c: add test for MAP_FIXED_NOREPLACE
  mm: thp: relocate flush_cache_range() in migrate_misplaced_transhuge_page()
  mm: thp: fix mmu_notifier in migrate_misplaced_transhuge_page()
  mm: thp: fix MADV_DONTNEED vs migrate_misplaced_transhuge_page race condition
  mm/kasan/quarantine.c: make quarantine_lock a raw_spinlock_t
  mm/gup: cache dev_pagemap while pinning pages
  Revert "x86/e820: put !E820_TYPE_RAM regions into memblock.reserved"
  mm: return zero_resv_unavail optimization
  mm: zero remaining unavailable struct pages
  tools/testing/selftests/vm/gup_benchmark.c: add MAP_HUGETLB option
  tools/testing/selftests/vm/gup_benchmark.c: add MAP_SHARED option
  tools/testing/selftests/vm/gup_benchmark.c: allow user specified file
  tools/testing/selftests/vm/gup_benchmark.c: fix 'write' flag usage
  mm/gup_benchmark.c: add additional pinning methods
  mm/gup_benchmark.c: time put_page()
  mm: don't raise MEMCG_OOM event due to failed high-order allocation
  mm/page-writeback.c: fix range_cyclic writeback vs writepages deadlock
  ...
---

345671ea0f9258f410eb057b9ced9cefbbe5dc78
diff --cc arch/powerpc/include/asm/book3s/32/pgtable.h
index e61dd3a,796d026..c21d337
--- a/arch/powerpc/include/asm/book3s/32/pgtable.h
+++ b/arch/powerpc/include/asm/book3s/32/pgtable.h
@@@ -309,14 -219,8 +309,8 @@@ static inline pte_t ptep_get_and_clear(
  static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,
  				      pte_t *ptep)
  {
 -	pte_update(ptep, (_PAGE_RW | _PAGE_HWWRITE), _PAGE_RO);
 +	pte_update(ptep, _PAGE_RW, 0);
  }
- static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,
- 					   unsigned long addr, pte_t *ptep)
- {
- 	ptep_set_wrprotect(mm, addr, ptep);
- }
- 
  
  static inline void __ptep_set_access_flags(struct vm_area_struct *vma,
  					   pte_t *ptep, pte_t entry,
diff --cc arch/powerpc/include/asm/nohash/32/pgtable.h
index f7b129a,6c82b96..3ffb0ff
--- a/arch/powerpc/include/asm/nohash/32/pgtable.h
+++ b/arch/powerpc/include/asm/nohash/32/pgtable.h
@@@ -295,17 -244,8 +295,11 @@@ static inline pte_t ptep_get_and_clear(
  static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,
  				      pte_t *ptep)
  {
 -	pte_update(ptep, (_PAGE_RW | _PAGE_HWWRITE), _PAGE_RO);
 +	unsigned long clr = ~pte_val(pte_wrprotect(__pte(~0)));
 +	unsigned long set = pte_val(pte_wrprotect(__pte(0)));
 +
 +	pte_update(ptep, clr, set);
  }
- static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,
- 					   unsigned long addr, pte_t *ptep)
- {
- 	ptep_set_wrprotect(mm, addr, ptep);
- }
- 
  
  static inline void __ptep_set_access_flags(struct vm_area_struct *vma,
  					   pte_t *ptep, pte_t entry,