[ARM] Fix __do_softirq breakage.

arch/arm/kernel/entry-common.S

@@ -22,15 +22,6 @@
 #error "Please fix"
 #endif
 
-/*
- * Our do_softirq out of line code.  See include/asm-arm/hardirq.h for
- * the calling assembly.
- */
-ENTRY(__do_softirq)
-	stmfd	sp!, {r0 - r3, ip, lr}
-	bl	do_softirq
-	ldmfd	sp!, {r0 - r3, ip, pc}
-
 	.align	5
 /*
  * This is the fast syscall return path.  We do as little as

include/asm-arm/hardirq.h

@@ -78,14 +78,14 @@ typedef struct {
 #endif
 
 #ifndef CONFIG_SMP
-/*
- * Some compilers get the use of "%?" wrong in the asm below.
- */
+
+extern asmlinkage void __do_softirq(void);
+
 #define irq_exit()							\
 	do {								\
 		preempt_count() -= IRQ_EXIT_OFFSET;			\
-		if (!in_interrupt() && softirq_pending(smp_processor_id())) \
-			__asm__("bl	__do_softirq": : : "lr", "cc");/* out of line */\
+		if (!in_interrupt() && local_softirq_pending())		\
+			__do_softirq();					\
 		preempt_enable_no_resched();				\
 	} while (0)