Revert "ARM: 8800/1: use choice for kernel unwinders"

This reverts commit b182bc7139 which is
commit f9b58e8c7d031b0daa5c9a9ee27f5a4028ba53ac upstream.

It is not needed in Android kernels, and it breaks the arm allmodconfig
build at this point in time, due to an invalid gcc check.

Fixes: b182bc7139 ("ARM: 8800/1: use choice for kernel unwinders")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iaf71effdf977b4dd74e583ac4a4b49af4ac4b59e

arch/arm/Kconfig.debug

@@ -45,42 +45,30 @@ config DEBUG_WX
 
 		If in doubt, say "Y".
 
-choice
+# RMK wants arm kernels compiled with frame pointers or stack unwinding.
-	prompt "Choose kernel unwinder"
+# If you know what you are doing and are willing to live without stack
-	default UNWINDER_ARM if AEABI && !FUNCTION_GRAPH_TRACER
+# traces, you can get a slightly smaller kernel by setting this option to
-	default UNWINDER_FRAME_POINTER if !AEABI || FUNCTION_GRAPH_TRACER
+# n, but then RMK will have to kill you ;).
+config FRAME_POINTER
+	bool
+	depends on !THUMB2_KERNEL
+	default y if !ARM_UNWIND || FUNCTION_GRAPH_TRACER
 	help
-	  This determines which method will be used for unwinding kernel stack
+	  If you say N here, the resulting kernel will be slightly smaller and
-	  traces for panics, oopses, bugs, warnings, perf, /proc/<pid>/stack,
+	  faster. However, if neither FRAME_POINTER nor ARM_UNWIND are enabled,
-	  livepatch, lockdep, and more.
+	  when a problem occurs with the kernel, the information that is
+	  reported is severely limited.
 
-config UNWINDER_FRAME_POINTER
+config ARM_UNWIND
-	bool "Frame pointer unwinder"
+	bool "Enable stack unwinding support (EXPERIMENTAL)"
-	depends on !THUMB2_KERNEL && !CC_IS_CLANG
-	select ARCH_WANT_FRAME_POINTERS
-	select FRAME_POINTER
-	help
-	  This option enables the frame pointer unwinder for unwinding
-	  kernel stack traces.
-
-config UNWINDER_ARM
-	bool "ARM EABI stack unwinder"
 	depends on AEABI
-	select ARM_UNWIND
+	default y
 	help
 	  This option enables stack unwinding support in the kernel
 	  using the information automatically generated by the
 	  compiler. The resulting kernel image is slightly bigger but
 	  the performance is not affected. Currently, this feature
-	  only works with EABI compilers.
+	  only works with EABI compilers. If unsure say Y.
-
-endchoice
-
-config ARM_UNWIND
-	bool
-
-config FRAME_POINTER
-	bool
 
 config OLD_MCOUNT
 	bool

lib/Kconfig.debug

@@ -1178,7 +1178,7 @@ config LOCKDEP
 	bool
 	depends on DEBUG_KERNEL && LOCK_DEBUGGING_SUPPORT
 	select STACKTRACE
-	select FRAME_POINTER if !MIPS && !PPC && !ARM && !S390 && !MICROBLAZE && !ARC && !X86
+	select FRAME_POINTER if !MIPS && !PPC && !ARM_UNWIND && !S390 && !MICROBLAZE && !ARC && !X86
 	select KALLSYMS
 	select KALLSYMS_ALL
 
@@ -1589,7 +1589,7 @@ config FAULT_INJECTION_STACKTRACE_FILTER
 	depends on FAULT_INJECTION_DEBUG_FS && STACKTRACE_SUPPORT
 	depends on !X86_64
 	select STACKTRACE
-	select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM && !ARC && !X86
+	select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC && !X86
 	help
 	  Provide stacktrace filter for fault-injection capabilities
 
@@ -1598,7 +1598,7 @@ config LATENCYTOP
 	depends on DEBUG_KERNEL
 	depends on STACKTRACE_SUPPORT
 	depends on PROC_FS
-	select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM && !ARC && !X86
+	select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC && !X86
 	select KALLSYMS
 	select KALLSYMS_ALL
 	select STACKTRACE