imx: properly protect mach/mx{1,[25][157x]}.h from multiple inclusion

[safe/jmp/linux-2.6] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 90ba5d3..c802352 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -69,16 +69,64 @@ config PGSTE
        bool
        default y if KVM
 
        bool
        default y if KVM
 

+config VIRT_CPU_ACCOUNTING
+       def_bool y
+
+config ARCH_SUPPORTS_DEBUG_PAGEALLOC
+       def_bool y
+

 mainmenu "Linux Kernel Configuration"
 
 config S390
        def_bool y
        select USE_GENERIC_SMP_HELPERS if SMP
 mainmenu "Linux Kernel Configuration"
 
 config S390
        def_bool y
        select USE_GENERIC_SMP_HELPERS if SMP

+       select HAVE_SYSCALL_WRAPPERS
+       select HAVE_FUNCTION_TRACER
+       select HAVE_FUNCTION_TRACE_MCOUNT_TEST
+       select HAVE_FTRACE_MCOUNT_RECORD
+       select HAVE_SYSCALL_TRACEPOINTS
+       select HAVE_DYNAMIC_FTRACE
+       select HAVE_FUNCTION_GRAPH_TRACER
+       select HAVE_DEFAULT_NO_SPIN_MUTEXES

        select HAVE_OPROFILE
        select HAVE_KPROBES
        select HAVE_KRETPROBES
        select HAVE_KVM if 64BIT
        select HAVE_ARCH_TRACEHOOK
        select HAVE_OPROFILE
        select HAVE_KPROBES
        select HAVE_KRETPROBES
        select HAVE_KVM if 64BIT
        select HAVE_ARCH_TRACEHOOK

+       select INIT_ALL_POSSIBLE
+       select HAVE_PERF_EVENTS
+       select ARCH_INLINE_SPIN_TRYLOCK
+       select ARCH_INLINE_SPIN_TRYLOCK_BH
+       select ARCH_INLINE_SPIN_LOCK
+       select ARCH_INLINE_SPIN_LOCK_BH
+       select ARCH_INLINE_SPIN_LOCK_IRQ
+       select ARCH_INLINE_SPIN_LOCK_IRQSAVE
+       select ARCH_INLINE_SPIN_UNLOCK
+       select ARCH_INLINE_SPIN_UNLOCK_BH
+       select ARCH_INLINE_SPIN_UNLOCK_IRQ
+       select ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE
+       select ARCH_INLINE_READ_TRYLOCK
+       select ARCH_INLINE_READ_LOCK
+       select ARCH_INLINE_READ_LOCK_BH
+       select ARCH_INLINE_READ_LOCK_IRQ
+       select ARCH_INLINE_READ_LOCK_IRQSAVE
+       select ARCH_INLINE_READ_UNLOCK
+       select ARCH_INLINE_READ_UNLOCK_BH
+       select ARCH_INLINE_READ_UNLOCK_IRQ
+       select ARCH_INLINE_READ_UNLOCK_IRQRESTORE
+       select ARCH_INLINE_WRITE_TRYLOCK
+       select ARCH_INLINE_WRITE_LOCK
+       select ARCH_INLINE_WRITE_LOCK_BH
+       select ARCH_INLINE_WRITE_LOCK_IRQ
+       select ARCH_INLINE_WRITE_LOCK_IRQSAVE
+       select ARCH_INLINE_WRITE_UNLOCK
+       select ARCH_INLINE_WRITE_UNLOCK_BH
+       select ARCH_INLINE_WRITE_UNLOCK_IRQ
+       select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
+
+config SCHED_OMIT_FRAME_POINTER
+       bool
+       default y

 
 source "init/Kconfig"
 
 
 source "init/Kconfig"
 


@@ -100,6 +148,9 @@ config 32BIT
        bool
        default y if !64BIT
 
        bool
        default y if !64BIT
 

+config KTIME_SCALAR
+       def_bool 32BIT
+

 config SMP
        bool "Symmetric multi-processing support"
        ---help---
 config SMP
        bool "Symmetric multi-processing support"
        ---help---


@@ -169,23 +220,8 @@ config AUDIT_ARCH
        bool
        default y
 
        bool
        default y
 

-config S390_SWITCH_AMODE
-       bool "Switch kernel/user addressing modes"
-       help
-         This option allows to switch the addressing modes of kernel and user
-         space. The kernel parameter switch_amode=on will enable this feature,
-         default is disabled. Enabling this (via kernel parameter) on machines
-         earlier than IBM System z9-109 EC/BC will reduce system performance.
-
-         Note that this option will also be selected by selecting the execute
-         protection option below. Enabling the execute protection via the
-         noexec kernel parameter will also switch the addressing modes,
-         independent of the switch_amode kernel parameter.
-
-

 config S390_EXEC_PROTECT
        bool "Data execute protection"
 config S390_EXEC_PROTECT
        bool "Data execute protection"

-       select S390_SWITCH_AMODE

        help
          This option allows to enable a buffer overflow protection for user
          space programs and it also selects the addressing mode option above.
        help
          This option allows to enable a buffer overflow protection for user
          space programs and it also selects the addressing mode option above.


@@ -229,6 +265,14 @@ config MARCH_Z9_109
          Class (z9 BC). The kernel will be slightly faster but will not
          work on older machines such as the z990, z890, z900, and z800.
 
          Class (z9 BC). The kernel will be slightly faster but will not
          work on older machines such as the z990, z890, z900, and z800.
 

+config MARCH_Z10
+       bool "IBM System z10"
+       help
+         Select this to enable optimizations for IBM System z10. The
+         kernel will be slightly faster but will not work on older
+         machines such as the z990, z890, z900, z800, z9-109, z9-ec
+         and z9-bc.
+

 endchoice
 
 config PACK_STACK
 endchoice
 
 config PACK_STACK


@@ -286,7 +330,7 @@ config WARN_STACK
          This option enables the compiler options -mwarn-framesize and
          -mwarn-dynamicstack. If the compiler supports these options it
          will generate warnings for function which either use alloca or
          This option enables the compiler options -mwarn-framesize and
          -mwarn-dynamicstack. If the compiler supports these options it
          will generate warnings for function which either use alloca or

-         create a stack frame bigger then CONFIG_WARN_STACK_SIZE.
+         create a stack frame bigger than CONFIG_WARN_STACK_SIZE.

 
          Say N if you are unsure.
 
 
          Say N if you are unsure.
 


@@ -325,17 +369,13 @@ config ARCH_ENABLE_MEMORY_HOTPLUG
 config ARCH_ENABLE_MEMORY_HOTREMOVE
        def_bool y
 
 config ARCH_ENABLE_MEMORY_HOTREMOVE
        def_bool y
 

+config ARCH_HIBERNATION_POSSIBLE
+       def_bool y if 64BIT
+

 source "mm/Kconfig"
 
 comment "I/O subsystem configuration"
 
 source "mm/Kconfig"
 
 comment "I/O subsystem configuration"
 

-config MACHCHK_WARNING
-       bool "Process warning machine checks"
-       help
-         Select this option if you want the machine check handler on IBM S/390 or
-         zSeries to process warning machine checks (e.g. on power failures).
-         If unsure, say "Y".
-

 config QDIO
        tristate "QDIO support"
        ---help---
 config QDIO
        tristate "QDIO support"
        ---help---


@@ -453,29 +493,9 @@ config CMM_IUCV
          Select this option to enable the special message interface to
          the cooperative memory management.
 
          Select this option to enable the special message interface to
          the cooperative memory management.
 

-config PAGE_STATES
-       bool "Unused page notification"
-       help
-         This enables the notification of unused pages to the
-         hypervisor. The ESSA instruction is used to do the states
-         changes between a page that has content and the unused state.
-
-config VIRT_TIMER
-       bool "Virtual CPU timer support"
-       help
-         This provides a kernel interface for virtual CPU timers.
-         Default is disabled.
-
-config VIRT_CPU_ACCOUNTING
-       bool "Base user process accounting on virtual cpu timer"
-       depends on VIRT_TIMER
-       help
-         Select this option to use CPU timer deltas to do user
-         process accounting.
-

 config APPLDATA_BASE
        bool "Linux - VM Monitor Stream, base infrastructure"
 config APPLDATA_BASE
        bool "Linux - VM Monitor Stream, base infrastructure"

-       depends on PROC_FS && VIRT_TIMER=y
+       depends on PROC_FS

        help
          This provides a kernel interface for creating and updating z/VM APPLDATA
          monitor records. The monitor records are updated at certain time
        help
          This provides a kernel interface for creating and updating z/VM APPLDATA
          monitor records. The monitor records are updated at certain time


@@ -520,7 +540,7 @@ config APPLDATA_OS
 
 config APPLDATA_NET_SUM
        tristate "Monitor overall network statistics"
 
 config APPLDATA_NET_SUM
        tristate "Monitor overall network statistics"

-       depends on APPLDATA_BASE
+       depends on APPLDATA_BASE && NET

        help
          This provides network related data to the Linux - VM Monitor Stream,
          currently there is only a total sum of network I/O statistics, no
        help
          This provides network related data to the Linux - VM Monitor Stream,
          currently there is only a total sum of network I/O statistics, no


@@ -551,7 +571,7 @@ config KEXEC
          but is independent of hardware/microcode support.
 
 config ZFCPDUMP
          but is independent of hardware/microcode support.
 
 config ZFCPDUMP

-       tristate "zfcpdump support"
+       bool "zfcpdump support"

        select SMP
        default n
        help
        select SMP
        default n
        help


@@ -569,6 +589,30 @@ bool "s390 guest support for KVM (EXPERIMENTAL)"
          the KVM hypervisor. This will add detection for KVM as well  as a
          virtio transport. If KVM is detected, the virtio console will be
          the default console.
          the KVM hypervisor. This will add detection for KVM as well  as a
          virtio transport. If KVM is detected, the virtio console will be
          the default console.

+
+config SECCOMP
+       bool "Enable seccomp to safely compute untrusted bytecode"
+       depends on PROC_FS
+       default y
+       help
+         This kernel feature is useful for number crunching applications
+         that may need to compute untrusted bytecode during their
+         execution. By using pipes or other transports made available to
+         the process as file descriptors supporting the read/write
+         syscalls, it's possible to isolate those applications in
+         their own address space using seccomp. Once seccomp is
+         enabled via /proc/<pid>/seccomp, it cannot be disabled
+         and the task is only allowed to execute a few safe syscalls
+         defined by each seccomp mode.
+
+         If unsure, say Y.
+
+endmenu
+
+menu "Power Management"
+
+source "kernel/power/Kconfig"
+

 endmenu
 
 source "net/Kconfig"
 endmenu
 
 source "net/Kconfig"