Merge branch 'for-next/arm'

2 files changed, 0 insertions, 33 deletions

diff --git a/arch/arm/cpu/cpu.c b/arch/arm/cpu/cpu.c
index e8191ecde5..eb12166c16 100644
--- a/arch/arm/cpu/cpu.c
+++ b/arch/arm/cpu/cpu.c
@@ -121,29 +121,3 @@ static int arm_request_stack(void)
 	return 0;
 }
 coredevice_initcall(arm_request_stack);
-
-#ifdef CONFIG_THUMB2_BAREBOX
-static void thumb2_execute(void *func, int argc, char *argv[])
-{
-	/*
-	 * Switch back to ARM mode before executing external
-	 * programs.
-	 */
-	__asm__ __volatile__ (
-		"mov r0, #0\n"
-		"mov r1, %0\n"
-		"mov r2, %1\n"
-		"bx %2\n"
-		:
-		: "r" (argc - 1), "r" (&argv[1]), "r" (func)
-		: "r0", "r1", "r2"
-	);
-}
-
-static int execute_init(void)
-{
-	do_execute = thumb2_execute;
-	return 0;
-}
-postcore_initcall(execute_init);
-#endif
diff --git a/arch/arm/cpu/interrupts.c b/arch/arm/cpu/interrupts.c
index c437af7188..fb4bb78dae 100644
--- a/arch/arm/cpu/interrupts.c
+++ b/arch/arm/cpu/interrupts.c
@@ -71,13 +71,6 @@ void show_regs (struct pt_regs *regs)
 #endif
 }
 
-#ifdef CONFIG_ARM_UNWIND
-void dump_stack(void)
-{
-	unwind_backtrace(NULL);
-}
-#endif
-
 static void __noreturn do_exception(struct pt_regs *pt_regs)
 {
 	show_regs(pt_regs);