From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Aug 2020 17:07:40 +0000 (-0700)
Subject: Merge tag 'xtensa-20200805' of git://github.com/jcmvbkbc/linux-xtensa
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bbcf9cd1576752ebe8d618ad8c6500b7e262ffac;p=linux.git

Merge tag 'xtensa-20200805' of git://github.com/jcmvbkbc/linux-xtensa

Pull Xtensa updates from Max Filippov:

 - add syscall audit support

 - add seccomp filter support

 - clean up make rules under arch/xtensa/boot

 - fix state management for exclusive access opcodes

 - fix build with PMU enabled

* tag 'xtensa-20200805' of git://github.com/jcmvbkbc/linux-xtensa:
  xtensa: add missing exclusive access state management
  xtensa: fix xtensa_pmu_setup prototype
  xtensa: add boot subdirectories build artifacts to 'targets'
  xtensa: add uImage and xipImage to targets
  xtensa: move vmlinux.bin[.gz] to boot subdirectory
  xtensa: initialize_mmu.h: fix a duplicated word
  selftests/seccomp: add xtensa support
  xtensa: add seccomp support
  xtensa: expose syscall through user_pt_regs
  xtensa: add audit support
---

bbcf9cd1576752ebe8d618ad8c6500b7e262ffac
diff --cc Documentation/features/seccomp/seccomp-filter/arch-support.txt
index f54ddfc06a124,7b3ec8ea174a5..c688aba22a8d6
--- a/Documentation/features/seccomp/seccomp-filter/arch-support.txt
+++ b/Documentation/features/seccomp/seccomp-filter/arch-support.txt
@@@ -28,6 -28,7 +28,6 @@@
      |          sh: | TODO |
      |       sparc: | TODO |
      |          um: |  ok  |
 -    |   unicore32: | TODO |
      |         x86: |  ok  |
-     |      xtensa: | TODO |
+     |      xtensa: |  ok  |
      -----------------------
diff --cc arch/xtensa/Kconfig
index b71ba910d92f7,a461ee051e73c..e997e0119c025
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@@ -21,9 -21,12 +21,11 @@@ config XTENS
  	select GENERIC_PCI_IOMAP
  	select GENERIC_SCHED_CLOCK
  	select GENERIC_STRNCPY_FROM_USER if KASAN
+ 	select HAVE_ARCH_AUDITSYSCALL
  	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL
  	select HAVE_ARCH_KASAN if MMU && !XIP_KERNEL
+ 	select HAVE_ARCH_SECCOMP_FILTER
  	select HAVE_ARCH_TRACEHOOK
 -	select HAVE_COPY_THREAD_TLS
  	select HAVE_DEBUG_KMEMLEAK
  	select HAVE_DMA_CONTIGUOUS
  	select HAVE_EXIT_THREAD