Merge tag 'alpha-for-v7.1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/lindh...

Pull alpha updates from Magnus Lindholm:
 "One fix to silence pgprot_modify() compiler warnings, and one patch
  adding SECCOMP/SECCOMP_FILTER support together with the syscall and
  ptrace fixes needed for it"

* tag 'alpha-for-v7.1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/lindholm/alpha:
  alpha: Define pgprot_modify to silence tautological comparison warnings
  alpha: add support for SECCOMP and SECCOMP_FILTER

diff --cc arch/alpha/include/asm/pgtable.h
index 268ddde3361714af6a9880b554f3043138b95c32,58870cad33517a3319553e3a8b5590412694f2b5..8e00cf9dc39deab1c4b7dd2cb5798275993452e3
--- 1/arch/alpha/include/asm/pgtable.h
--- 2/arch/alpha/include/asm/pgtable.h
+++ b/arch/alpha/include/asm/pgtable.h
@@@ -126,6 -126,23 +126,17 @@@ struct vm_area_struct
   */
  #define pgprot_noncached(prot)        (prot)
  
 -/*
 - * ZERO_PAGE is a global shared page that is always zero:  used
 - * for zero-mapped memory areas etc..
 - */
 -#define ZERO_PAGE(vaddr)      (virt_to_page(ZERO_PGE))
 -
+ /*
+  * All caching attribute macros are identity on Alpha, so the generic
+  * pgprot_modify() degenerates to tautological self-comparisons.
+  * Override it to just return newprot directly.
+  */
+ #define pgprot_modify pgprot_modify
+ static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
+ {
+       return newprot;
+ }
+ 
  /*
   * On certain platforms whose physical address space can overlap KSEG,
   * namely EV6 and above, we must re-twiddle the physaddr to restore the