From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Fri, 5 May 2017 16:57:23 +0000 (-0700)
Subject: Merge branch topic/uek-4.1/sparc of git://ca-git.us.oracle.com/linux-uek into uek... 
X-Git-Tag: v4.1.12-98.0.20170517_2143~33
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=eace5313104bc7007afb5c2a61f77e6b505e760b;p=users%2Fjedix%2Flinux-maple.git

Merge branch topic/uek-4.1/sparc of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

* topic/uek-4.1/sparc: (32 commits)
  sparc64: Detect DAX ra+pgsz when hvapi minor doesn't indicate it
  sparc64: DAX memory will use RA+PGSZ feature in HV
  sparc64: Disable DAX flow control
  sparc64: Add DAX hypervisor services
  sparc64: DAX memory needs persistent mappings
  sparc64: Fix incorrect error print in DAX driver when validating ccb
  sparc64: DAX request for non 4MB memory should return with unique errno
  Revert "sparc64: DAX request for non 4MB memory should return with unique errno"
  sparc64: DAX request to mmap non 4MB memory should fail with a debug print
  sparc64: DAX request for non 4MB memory should return with unique errno
  sparc64: Incorrect print by DAX driver when old driver API is used
  sparc64: DAX request to dequeue half of a long CCB should not succeed
  sparc64: dax_overflow_check reports incorrect data
  sparc64: Ignored DAX ref count causes lockup
  sparc64: disable dax page range checking on RA
  sparc64: Oracle Data Analytics Accelerator (DAX) driver
  sparc64: fix an issue when trying to bring hotplug cpus online
  sparc64: Fix memory corruption when THP is enabled
  sparc64: Fix address range for page table free Orabug: 25704426
  sparc64: Add support for 2G hugepages
  ...
---

eace5313104bc7007afb5c2a61f77e6b505e760b
diff --cc arch/sparc/include/asm/pgtable_64.h
index e6d6372b12179,c409b44c3c5ad..e823bdbee6a27
--- a/arch/sparc/include/asm/pgtable_64.h
+++ b/arch/sparc/include/asm/pgtable_64.h
@@@ -920,13 -922,13 +922,13 @@@ static void maybe_tlb_batch_add(struct 
  	 *             and SUN4V pte layout, so this inline test is fine.
  	 */
  	if (likely(mm != &init_mm) && pte_accessible(mm, orig))
- 		tlb_batch_add(mm, vaddr, ptep, orig, fullmm);
+ 		tlb_batch_add(mm, vaddr, ptep, orig, fullmm, hugepage_shift);
  }
  
 -#define __HAVE_ARCH_PMDP_GET_AND_CLEAR
 -static inline pmd_t pmdp_get_and_clear(struct mm_struct *mm,
 -				       unsigned long addr,
 -				       pmd_t *pmdp)
 +#define __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEAR
 +static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm,
 +					    unsigned long addr,
 +					    pmd_t *pmdp)
  {
  	pmd_t pmd = *pmdp;
  	set_pmd_at(mm, addr, pmdp, __pmd(0UL));