Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux-2.6-microblaze.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 1f0bd7e..e9f13fe 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -59,7 +59,10 @@ config HAVE_SETUP_PER_CPU_AREA
        def_bool PPC64
 
 config NEED_PER_CPU_EMBED_FIRST_CHUNK
-       def_bool PPC64
+       def_bool y if PPC64
+
+config NEED_PER_CPU_PAGE_FIRST_CHUNK
+       def_bool y if PPC64
 
 config NR_IRQS
        int "Number of virtual interrupt numbers"
@@ -148,6 +151,7 @@ config PPC
        select ARCH_USE_QUEUED_RWLOCKS          if PPC_QUEUED_SPINLOCKS
        select ARCH_USE_QUEUED_SPINLOCKS        if PPC_QUEUED_SPINLOCKS
        select ARCH_WANT_IPC_PARSE_VERSION
+       select ARCH_WANT_IRQS_OFF_ACTIVATE_MM
        select ARCH_WEAK_RELEASE_ACQUIRE
        select BINFMT_ELF
        select BUILDTIME_TABLE_SORT
@@ -964,7 +968,7 @@ config PPC_MEM_KEYS
 config PPC_SECURE_BOOT
        prompt "Enable secure boot support"
        bool
-       depends on PPC_POWERNV
+       depends on PPC_POWERNV || PPC_PSERIES
        depends on IMA_ARCH_POLICY
        imply IMA_SECURE_AND_OR_TRUSTED_BOOT
        help
@@ -984,6 +988,19 @@ config PPC_SECVAR_SYSFS
          read/write operations on these variables. Say Y if you have
          secure boot enabled and want to expose variables to userspace.
 
+config PPC_RTAS_FILTER
+       bool "Enable filtering of RTAS syscalls"
+       default y
+       depends on PPC_RTAS
+       help
+         The RTAS syscall API has security issues that could be used to
+         compromise system integrity. This option enforces restrictions on the
+         RTAS calls and arguments passed by userspace programs to mitigate
+         these issues.
+
+         Say Y unless you know what you are doing and the filter is causing
+         problems for you.
+
 endmenu
 
 config ISA_DMA_API