]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'xtensa-20200805' of git://github.com/jcmvbkbc/linux-xtensa
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Aug 2020 17:07:40 +0000 (10:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Aug 2020 17:07:40 +0000 (10:07 -0700)
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

1  2 
Documentation/features/seccomp/seccomp-filter/arch-support.txt
arch/xtensa/Kconfig
tools/testing/selftests/seccomp/seccomp_bpf.c

index f54ddfc06a12408670eb3e245f3f22c6e4ff2e38,7b3ec8ea174a5ca78a4450130713076b4a67ad7c..c688aba22a8d60d9f6aba7070e979fb76fe9a3ed
@@@ -28,6 -28,7 +28,6 @@@
      |          sh: | TODO |
      |       sparc: | TODO |
      |          um: |  ok  |
 -    |   unicore32: | TODO |
      |         x86: |  ok  |
-     |      xtensa: | TODO |
+     |      xtensa: |  ok  |
      -----------------------
index b71ba910d92f79d5b68645700b214e803d9b958b,a461ee051e73c7c28e95208ba295fa3468de4978..e997e0119c02514a9f91b87f8f84fc065a9b1c10
@@@ -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