From 494b6a82e446dece0e2c9ee9381e998b609fcd04 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 15 Jun 2009 06:22:08 -0400
Subject: [PATCH] --- yaml --- r: 153871 b: refs/heads/master c:
 81b79c213d0200fdd16951a9fb18748fd511d810 h: refs/heads/master i:   153869:
 3aab3c2c04c74ec71dc7963d1a409ecefaf608d2   153867:
 f51c448f37302eaeeaa8b547af06308c27826d55   153863:
 6214b308bff327500718f85a9dc4ec28b89e9de1   153855:
 ec13d3593320ca67df43434f791b9ff2d76680e0 v: v3

---
 [refs]                               |  2 +-
 trunk/arch/blackfin/kernel/irqchip.c | 43 ++++++++++++++++------------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 39d097fc5328..fdb1bc8be831 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f10fdabdce356aac3c948e659f39b6f1e2f7382
+refs/heads/master: 81b79c213d0200fdd16951a9fb18748fd511d810
diff --git a/trunk/arch/blackfin/kernel/irqchip.c b/trunk/arch/blackfin/kernel/irqchip.c
index 7378440792a4..4b5fd36187d9 100644
--- a/trunk/arch/blackfin/kernel/irqchip.c
+++ b/trunk/arch/blackfin/kernel/irqchip.c
@@ -104,6 +104,29 @@ static void check_stack_overflow(int irq)
 static inline void check_stack_overflow(int irq) { }
 #endif
 
+#ifndef CONFIG_IPIPE
+static void maybe_lower_to_irq14(void)
+{
+	unsigned short pending, other_ints;
+
+	/*
+	 * If we're the only interrupt running (ignoring IRQ15 which
+	 * is for syscalls), lower our priority to IRQ14 so that
+	 * softirqs run at that level.  If there's another,
+	 * lower-level interrupt, irq_exit will defer softirqs to
+	 * that. If the interrupt pipeline is enabled, we are already
+	 * running at IRQ14 priority, so we don't need this code.
+	 */
+	CSYNC();
+	pending = bfin_read_IPEND() & ~0x8000;
+	other_ints = pending & (pending - 1);
+	if (other_ints == 0)
+		lower_to_irq14();
+}
+#else
+static inline void maybe_lower_to_irq14(void) { }
+#endif
+
 /*
  * do_IRQ handles all hardware IRQs.  Decoded IRQs should not
  * come via this function.  Instead, they should provide their
@@ -114,9 +137,6 @@ __attribute__((l1_text))
 #endif
 asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs)
 {
-#ifndef CONFIG_IPIPE
-	unsigned short pending, other_ints;
-#endif
 	struct pt_regs *old_regs = set_irq_regs(regs);
 
 	irq_enter();
@@ -132,21 +152,8 @@ asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs)
 	else
 		generic_handle_irq(irq);
 
-#ifndef CONFIG_IPIPE
-	/*
-	 * If we're the only interrupt running (ignoring IRQ15 which
-	 * is for syscalls), lower our priority to IRQ14 so that
-	 * softirqs run at that level.  If there's another,
-	 * lower-level interrupt, irq_exit will defer softirqs to
-	 * that. If the interrupt pipeline is enabled, we are already
-	 * running at IRQ14 priority, so we don't need this code.
-	 */
-	CSYNC();
-	pending = bfin_read_IPEND() & ~0x8000;
-	other_ints = pending & (pending - 1);
-	if (other_ints == 0)
-		lower_to_irq14();
-#endif /* !CONFIG_IPIPE */
+	maybe_lower_to_irq14();
+
 	irq_exit();
 
 	set_irq_regs(old_regs);