From 00848e948c935aedceef31da44945b6ef3f4c486 Mon Sep 17 00:00:00 2001
From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Mon, 30 Apr 2007 11:30:10 -0500
Subject: [PATCH] --- yaml --- r: 53611 b: refs/heads/master c:
 9f483519be82420e308b9a90a96a9c62f28032ae h: refs/heads/master i:   53609:
 3402afd5d45c8bcee055567c705c463db3e2d900   53607:
 721513497a16fd884d828ede44ecfd8a76383ce5 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/i386/mach-voyager/setup.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b67fae7210bc..c6c6df28c349 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2feae2158a96aa5e02ca2e630896e6f553c36dc0
+refs/heads/master: 9f483519be82420e308b9a90a96a9c62f28032ae
diff --git a/trunk/arch/i386/mach-voyager/setup.c b/trunk/arch/i386/mach-voyager/setup.c
index cfa16c151c8f..447bb105cf58 100644
--- a/trunk/arch/i386/mach-voyager/setup.c
+++ b/trunk/arch/i386/mach-voyager/setup.c
@@ -40,10 +40,16 @@ void __init trap_init_hook(void)
 {
 }
 
-static struct irqaction irq0  = { timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "timer", NULL, NULL};
+static struct irqaction irq0  = {
+	.handler = timer_interrupt,
+	.flags = IRQF_DISABLED | IRQF_NOBALANCING,
+	.mask = CPU_MASK_NONE,
+	.name = "timer"
+};
 
 void __init time_init_hook(void)
 {
+	irq0.mask = cpumask_of_cpu(safe_smp_processor_id());
 	setup_irq(0, &irq0);
 }