From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Apr 2018 21:08:58 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4608f064532c28c0ea3c03fe26a3a5909852811a;p=linux.git

Merge git://git./linux/kernel/git/davem/sparc-next

Pull sparc updates from David Miller:

 1) Add support for ADI (Application Data Integrity) found in more
    recent sparc64 cpus. Essentially this is keyed based access to
    virtual memory, and if the key encoded in the virual address is
    wrong you get a trap.

    The mm changes were reviewed by Andrew Morton and others.

    Work by Khalid Aziz.

 2) Validate DAX completion index range properly, from Rob Gardner.

 3) Add proper Kconfig deps for DAX driver. From Guenter Roeck.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next:
  sparc64: Make atomic_xchg() an inline function rather than a macro.
  sparc64: Properly range check DAX completion index
  sparc: Make auxiliary vectors for ADI available on 32-bit as well
  sparc64: Oracle DAX driver depends on SPARC64
  sparc64: Update signal delivery to use new helper functions
  sparc64: Add support for ADI (Application Data Integrity)
  mm: Allow arch code to override copy_highpage()
  mm: Clear arch specific VM flags on protection change
  mm: Add address parameter to arch_validate_prot()
  sparc64: Add auxiliary vectors to report platform ADI properties
  sparc64: Add handler for "Memory Corruption Detected" trap
  sparc64: Add HV fault type handlers for ADI related faults
  sparc64: Add support for ADI register fields, ASIs and traps
  mm, swap: Add infrastructure for saving page metadata on swap
  signals, sparc: Add signal codes for ADI violations
---

4608f064532c28c0ea3c03fe26a3a5909852811a
diff --cc include/linux/mm.h
index ccac10682ce58,32fe6919a11bf..f945dff34925b
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@@ -241,8 -241,13 +241,11 @@@ extern unsigned int kobjsize(const voi
  # define VM_SAO		VM_ARCH_1	/* Strong Access Ordering (powerpc) */
  #elif defined(CONFIG_PARISC)
  # define VM_GROWSUP	VM_ARCH_1
 -#elif defined(CONFIG_METAG)
 -# define VM_GROWSUP	VM_ARCH_1
  #elif defined(CONFIG_IA64)
  # define VM_GROWSUP	VM_ARCH_1
+ #elif defined(CONFIG_SPARC64)
+ # define VM_SPARC_ADI	VM_ARCH_1	/* Uses ADI tag for access control */
+ # define VM_ARCH_CLEAR	VM_SPARC_ADI
  #elif !defined(CONFIG_MMU)
  # define VM_MAPPED_COPY	VM_ARCH_1	/* T if mapped copy of data (nommu mmap) */
  #endif