1 files changed, 34 insertions, 16 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e91c7cdc6fe5..117e81b12009 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -6,7 +6,7 @@ config ARM
         select HAVE_DMA_API_DEBUG
         select HAVE_IDE if PCI || ISA || PCMCIA
         select HAVE_DMA_ATTRS
-        select HAVE_DMA_CONTIGUOUS if (CPU_V6 || CPU_V6K || CPU_V7)
+        select HAVE_DMA_CONTIGUOUS if MMU
         select HAVE_MEMBLOCK
         select RTC_LIB
         select SYS_SUPPORTS_APM_EMULATION
@@ -16,6 +16,7 @@ config ARM
         select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL
         select HAVE_ARCH_KGDB
         select HAVE_ARCH_TRACEHOOK
+        select HAVE_SYSCALL_TRACEPOINTS
         select HAVE_KPROBES if !XIP_KERNEL
         select HAVE_KRETPROBES if (HAVE_KPROBES)
         select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
@@ -38,7 +39,6 @@ config ARM
         select HARDIRQS_SW_RESEND
         select GENERIC_IRQ_PROBE
         select GENERIC_IRQ_SHOW
-        select GENERIC_IRQ_PROBE
         select ARCH_WANT_IPC_PARSE_VERSION
         select HARDIRQS_SW_RESEND
         select CPU_PM if (SUSPEND || CPU_IDLE)
@@ -126,11 +126,6 @@ config TRACE_IRQFLAGS_SUPPORT
         bool
         default y
 
-config GENERIC_LOCKBREAK
-        bool
-        default y
-        depends on SMP && PREEMPT
-
 config RWSEM_GENERIC_SPINLOCK
         bool
         default y
@@ -1419,6 +1414,16 @@ config PL310_ERRATA_769419
           on systems with an outer cache, the store buffer is drained
           explicitly.
 
+config ARM_ERRATA_775420
+       bool "ARM errata: A data cache maintenance operation which aborts, might lead to deadlock"
+       depends on CPU_V7
+       help
+         This option enables the workaround for the 775420 Cortex-A9 (r2p2,
+         r2p6,r2p8,r2p10,r3p0) erratum. In case a date cache maintenance
+         operation aborts with MMU exception, it might cause the processor
+         to deadlock. This workaround puts DSB before executing ISB if
+         an abort may occur on cache maintenance.
+
 endmenu
 
 source "arch/arm/common/Kconfig"
@@ -1855,8 +1860,8 @@ config ALIGNMENT_TRAP
           configuration it is safe to say N, otherwise say Y.
 
 config UACCESS_WITH_MEMCPY
-        bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user() (EXPERIMENTAL)"
-        depends on MMU && EXPERIMENTAL
+        bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()"
+        depends on MMU
         default y if CPU_FEROCEON
         help
           Implement faster copy_to_user and clear_user methods for CPU
@@ -1897,12 +1902,6 @@ config CC_STACKPROTECTOR
           neutralized via a kernel panic.
           This feature requires gcc version 4.2 or above.
 
-config DEPRECATED_PARAM_STRUCT
-        bool "Provide old way to pass kernel parameters"
-        help
-          This was deprecated in 2001 and announced to live on for 5 years.
-          Some old boot loaders still use this way.
-
 endmenu
 
 menu "Boot options"
@@ -1915,6 +1914,23 @@ config USE_OF
         help
           Include support for flattened device tree machine descriptions.
 
+config ATAGS
+        bool "Support for the traditional ATAGS boot data passing" if USE_OF
+        default y
+        help
+          This is the traditional way of passing data to the kernel at boot
+          time. If you are solely relying on the flattened device tree (or
+          the ARM_ATAG_DTB_COMPAT option) then you may unselect this option
+          to remove ATAGS support from your kernel binary.  If unsure,
+          leave this to y.
+
+config DEPRECATED_PARAM_STRUCT
+        bool "Provide old way to pass kernel parameters"
+        depends on ATAGS
+        help
+          This was deprecated in 2001 and announced to live on for 5 years.
+          Some old boot loaders still use this way.
+
 # Compressed boot loader in ROM.  Yes, we really want to ask about
 # TEXT and BSS so we preserve their values in the config files.
 config ZBOOT_ROM_TEXT
@@ -2041,6 +2057,7 @@ config CMDLINE
 choice
         prompt "Kernel command line type" if CMDLINE != ""
         default CMDLINE_FROM_BOOTLOADER
+        depends on ATAGS
 
 config CMDLINE_FROM_BOOTLOADER
         bool "Use bootloader kernel arguments if available"
@@ -2110,7 +2127,7 @@ config KEXEC
 
 config ATAGS_PROC
         bool "Export atags in procfs"
-        depends on KEXEC
+        depends on ATAGS && KEXEC
         default y
         help
           Should the atags used to boot the kernel be exported in an "atags"
@@ -2150,6 +2167,7 @@ source "drivers/cpufreq/Kconfig"
 config CPU_FREQ_IMX
         tristate "CPUfreq driver for i.MX CPUs"
         depends on ARCH_MXC && CPU_FREQ
+        select CPU_FREQ_TABLE
         help
           This enables the CPUfreq driver for i.MX CPUs.