AMD IOMMU: fix possible race while accessing iommu->need_sync

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

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 0b07922..644a70b 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -7,6 +7,10 @@ mainmenu "Linux/PA-RISC Kernel Configuration"
 
 config PARISC
        def_bool y
 
 config PARISC
        def_bool y

+       select HAVE_IDE
+       select HAVE_OPROFILE
+       select RTC_CLASS
+       select RTC_DRV_PARISC

        help
          The PA-RISC microprocessor is designed by Hewlett-Packard and used
          in many of their workstations & servers (HP9000 700 and 800 series,
        help
          The PA-RISC microprocessor is designed by Hewlett-Packard and used
          in many of their workstations & servers (HP9000 700 and 800 series,


@@ -19,8 +23,10 @@ config MMU
 config STACK_GROWSUP
        def_bool y
 
 config STACK_GROWSUP
        def_bool y
 

-config UID16
+config GENERIC_LOCKBREAK

        bool
        bool

+       default y
+       depends on SMP && PREEMPT

 
 config RWSEM_GENERIC_SPINLOCK
        def_bool y
 
 config RWSEM_GENERIC_SPINLOCK
        def_bool y


@@ -28,12 +34,39 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
        bool
 
 config RWSEM_XCHGADD_ALGORITHM
        bool
 

+config ARCH_HAS_ILOG2_U32
+       bool
+       default n
+
+config ARCH_HAS_ILOG2_U64
+       bool
+       default n
+
+config GENERIC_FIND_NEXT_BIT
+       bool
+       default y
+
+config GENERIC_BUG
+       bool
+       default y
+       depends on BUG
+
+config GENERIC_HWEIGHT
+       bool
+       default y
+

 config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
 config GENERIC_CALIBRATE_DELAY
        bool
        default y
 

-config GENERIC_ISA_DMA
+config GENERIC_TIME

        bool
        bool

+       default y
+
+config TIME_LOW_RES
+       bool
+       depends on SMP
+       default y

 
 config GENERIC_HARDIRQS
        def_bool y
 
 config GENERIC_HARDIRQS
        def_bool y


@@ -41,20 +74,26 @@ config GENERIC_HARDIRQS
 config GENERIC_IRQ_PROBE
        def_bool y
 
 config GENERIC_IRQ_PROBE
        def_bool y
 

+config IRQ_PER_CPU
+       bool
+       default y
+

 # unless you want to implement ACPI on PA-RISC ... ;-)
 config PM
        bool
 
 config ISA_DMA_API
        bool
 # unless you want to implement ACPI on PA-RISC ... ;-)
 config PM
        bool
 
 config ISA_DMA_API
        bool

-       default y

 
 config ARCH_MAY_HAVE_PC_FDC
        bool
 
 config ARCH_MAY_HAVE_PC_FDC
        bool

+       depends on BROKEN

        default y
 
 source "init/Kconfig"
 
        default y
 
 source "init/Kconfig"
 

+source "kernel/Kconfig.freezer"
+

 
 menu "Processor type and features"
 
 
 menu "Processor type and features"
 


@@ -113,7 +152,7 @@ config PA11
 
 config PREFETCH
        def_bool y
 
 config PREFETCH
        def_bool y

-       depends on PA8X00
+       depends on PA8X00 || PA7200

 
 config 64BIT
        bool "64-bit kernel"
 
 config 64BIT
        bool "64-bit kernel"


@@ -128,8 +167,40 @@ config 64BIT
          enable this option otherwise. The 64bit kernel is significantly bigger
          and slower than the 32bit one.
 
          enable this option otherwise. The 64bit kernel is significantly bigger
          and slower than the 32bit one.
 

+choice
+       prompt "Kernel page size"
+       default PARISC_PAGE_SIZE_4KB  if !64BIT
+       default PARISC_PAGE_SIZE_4KB  if 64BIT
+#      default PARISC_PAGE_SIZE_16KB if 64BIT
+
+config PARISC_PAGE_SIZE_4KB
+       bool "4KB"
+       help
+         This lets you select the page size of the kernel.  For best
+         performance, a page size of 16KB is recommended.  For best
+         compatibility with 32bit applications, a page size of 4KB should be
+         selected (the vast majority of 32bit binaries work perfectly fine
+         with a larger page size).
+
+         4KB                For best 32bit compatibility
+         16KB               For best performance
+         64KB               For best performance, might give more overhead.
+
+         If you don't know what to do, choose 4KB.
+
+config PARISC_PAGE_SIZE_16KB
+       bool "16KB (EXPERIMENTAL)"
+       depends on PA8X00 && EXPERIMENTAL
+
+config PARISC_PAGE_SIZE_64KB
+       bool "64KB (EXPERIMENTAL)"
+       depends on PA8X00 && EXPERIMENTAL
+
+endchoice
+

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

+       select USE_GENERIC_SMP_HELPERS

        ---help---
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If
        ---help---
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If


@@ -141,9 +212,8 @@ config SMP
          singleprocessor machines. On a singleprocessor machine, the kernel
          will run faster if you say N here.
 
          singleprocessor machines. On a singleprocessor machine, the kernel
          will run faster if you say N here.
 

-         See also the <file:Documentation/smp.txt>,
-         <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available
-         at <http://www.tldp.org/docs.html#howto>.
+         See also <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO
+         available at <http://www.tldp.org/docs.html#howto>.

 
          If you don't know what to do here, say N.
 
 
          If you don't know what to do here, say N.
 


@@ -152,21 +222,29 @@ config HOTPLUG_CPU
        default y if SMP
        select HOTPLUG
 
        default y if SMP
        select HOTPLUG
 

+config ARCH_SELECT_MEMORY_MODEL
+       def_bool y
+       depends on 64BIT
+

 config ARCH_DISCONTIGMEM_ENABLE
 config ARCH_DISCONTIGMEM_ENABLE

-       bool "Discontiguous memory support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
-       help
-         Say Y to support efficient handling of discontiguous physical memory,
-         for architectures which are either NUMA (Non-Uniform Memory Access)
-         or have huge holes in the physical address space for other reasons.
-         See <file:Documentation/vm/numa> for more.
+       def_bool y
+       depends on 64BIT

 
 

-source "mm/Kconfig"
+config ARCH_FLATMEM_ENABLE
+       def_bool y

 
 

-config PREEMPT
-       bool
-#      bool "Preemptible Kernel"
-       default n
+config ARCH_DISCONTIGMEM_DEFAULT
+       def_bool y
+       depends on ARCH_DISCONTIGMEM_ENABLE
+
+config NODES_SHIFT
+       int
+       default "3"
+       depends on NEED_MULTIPLE_NODES
+
+source "kernel/Kconfig.preempt"
+source "kernel/Kconfig.hz"
+source "mm/Kconfig"

 
 config COMPAT
        def_bool y
 
 config COMPAT
        def_bool y


@@ -200,8 +278,6 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
 
 source "fs/Kconfig"
 

-source "arch/parisc/oprofile/Kconfig"
-

 source "arch/parisc/Kconfig.debug"
 
 source "security/Kconfig"
 source "arch/parisc/Kconfig.debug"
 
 source "security/Kconfig"