kbuild: Fix instrumentation removal breakage on avr32

[sfrench/cifs-2.6.git] / arch / avr32 / Kconfig

diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index b77abce10c7aa895689f6210944d0d5b780bba83..c816f29154c929be053fd48c6b48f98913779b30 100644 (file)
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -10,6 +10,8 @@ config AVR32
        # With EMBEDDED=n, we get lots of stuff automatically selected
        # that we usually don't need on AVR32.
        select EMBEDDED
+       select HAVE_OPROFILE
+       select HAVE_KPROBES
        help
          AVR32 is a high-performance 32-bit RISC microprocessor core,
          designed for cost-sensitive embedded applications, with particular
@@ -81,19 +83,23 @@ config PLATFORM_AT32AP
        select MMU
        select PERFORMANCE_COUNTERS
 
-choice
-       prompt "AVR32 CPU type"
-       default CPU_AT32AP7000
+#
+# CPU types
+#
 
-config CPU_AT32AP7000
-       bool "AT32AP7000"
+# AP7000 derivatives
+config CPU_AT32AP700X
+       bool
        select PLATFORM_AT32AP
-endchoice
-
-#
-# CPU Daughterboards for ATSTK1000
-config BOARD_ATSTK1002
+config CPU_AT32AP7000
+       bool
+       select CPU_AT32AP700X
+config CPU_AT32AP7001
+       bool
+       select CPU_AT32AP700X
+config CPU_AT32AP7002
        bool
+       select CPU_AT32AP700X
 
 choice
        prompt "AVR32 board type"
@@ -101,10 +107,10 @@ choice
 
 config BOARD_ATSTK1000
        bool "ATSTK1000 evaluation board"
-       select BOARD_ATSTK1002 if CPU_AT32AP7000
 
 config BOARD_ATNGW100
        bool "ATNGW100 Network Gateway"
+       select CPU_AT32AP7000
 endchoice
 
 if BOARD_ATSTK1000
@@ -123,15 +129,15 @@ source "arch/avr32/mach-at32ap/Kconfig"
 
 config LOAD_ADDRESS
        hex
-       default 0x10000000 if LOADER_U_BOOT=y && CPU_AT32AP7000=y
+       default 0x10000000 if LOADER_U_BOOT=y && CPU_AT32AP700X=y
 
 config ENTRY_ADDRESS
        hex
-       default 0x90000000 if LOADER_U_BOOT=y && CPU_AT32AP7000=y
+       default 0x90000000 if LOADER_U_BOOT=y && CPU_AT32AP700X=y
 
 config PHYS_OFFSET
        hex
-       default 0x10000000 if CPU_AT32AP7000=y
+       default 0x10000000 if CPU_AT32AP700X=y
 
 source "kernel/Kconfig.preempt"
 
@@ -163,6 +169,16 @@ config OWNERSHIP_TRACE
          enabling Nexus-compliant debuggers to keep track of the PID of the
          currently executing task.
 
+config NMI_DEBUGGING
+       bool "NMI Debugging"
+       default n
+       help
+         Say Y here and pass the nmi_debug command-line parameter to
+         the kernel to turn on NMI debugging. Depending on the value
+         of the nmi_debug option, various pieces of information will
+         be dumped to the console when a Non-Maskable Interrupt
+         happens.
+
 # FPU emulation goes here
 
 source "kernel/Kconfig.hz"