Merge branch 'parisc-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Mar 2016 12:55:14 +0000 (07:55 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Mar 2016 12:55:14 +0000 (07:55 -0500)
Pull parisc fixes from Helge Deller:
 "Fix seccomp filter support and SIGSYS signals on compat kernel.

  Both patches are tagged for v4.5 stable kernel"

* 'parisc-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Fix and enable seccomp filter support
  parisc: Fix SIGSYS signals in compat case

1  2 
arch/parisc/Kconfig

diff --combined arch/parisc/Kconfig
index 989fa14147a9b53847223dbc1c959dd08ba23232,86ed37671ef5add17e4df2adfb792a1290c9927c..bd3c873951a1ad2e890a77a57172d2ea7aedee71
@@@ -11,7 -11,6 +11,7 @@@ config PARIS
        select RTC_DRV_GENERIC
        select INIT_ALL_POSSIBLE
        select BUG
 +      select BUILDTIME_EXTABLE_SORT
        select HAVE_PERF_EVENTS
        select GENERIC_ATOMIC64 if !64BIT
        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
@@@ -30,6 -29,7 +30,7 @@@
        select TTY # Needed for pdc_cons.c
        select HAVE_DEBUG_STACKOVERFLOW
        select HAVE_ARCH_AUDITSYSCALL
+       select HAVE_ARCH_SECCOMP_FILTER
        select ARCH_NO_COHERENT_DMA_MMAP
  
        help
This page took 0.026036 seconds and 5 git commands to generate.