From cf7536aca4f7504bebcc28f151c7d52d60c3926f Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Mon, 21 Sep 2009 17:08:55 +0200
Subject: [PATCH] --- yaml --- r: 166608 b: refs/heads/master c:
 b265158399ad825411f3d471cacc46b00d0e4841 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/mips/kernel/smtc.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6b20b742e4d0..9e5ebb434dac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 742db5d1085df97354ce65daf9b6b657696d5268
+refs/heads/master: b265158399ad825411f3d471cacc46b00d0e4841
diff --git a/trunk/arch/mips/kernel/smtc.c b/trunk/arch/mips/kernel/smtc.c
index 67153a0dc267..4d181df44a40 100644
--- a/trunk/arch/mips/kernel/smtc.c
+++ b/trunk/arch/mips/kernel/smtc.c
@@ -1098,9 +1098,8 @@ static void ipi_irq_dispatch(void)
 
 static struct irqaction irq_ipi = {
 	.handler	= ipi_interrupt,
-	.flags		= IRQF_DISABLED,
-	.name		= "SMTC_IPI",
-	.flags		= IRQF_PERCPU
+	.flags		= IRQF_DISABLED | IRQF_PERCPU,
+	.name		= "SMTC_IPI"
 };
 
 static void setup_cross_vpe_interrupts(unsigned int nvpe)