From 884b617c7a4b36b9dc14288a22dda82d868a2545 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Wed, 26 Aug 2009 16:20:13 -0700
Subject: [PATCH] --- yaml --- r: 158180 b: refs/heads/master c:
 372e24b0cb764ec55b4cf3408a95ae40a29e5b96 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/irq/handle.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 832279f2e554..3f956d7f0381 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31b47cf7609288893a10706c648faa932c7aef90
+refs/heads/master: 372e24b0cb764ec55b4cf3408a95ae40a29e5b96
diff --git a/trunk/kernel/irq/handle.c b/trunk/kernel/irq/handle.c
index 065205bdd920..a81cf80554db 100644
--- a/trunk/kernel/irq/handle.c
+++ b/trunk/kernel/irq/handle.c
@@ -161,7 +161,7 @@ int __init early_irq_init(void)
 
 	desc = irq_desc_legacy;
 	legacy_count = ARRAY_SIZE(irq_desc_legacy);
- 	node = first_online_node;
+	node = first_online_node;
 
 	/* allocate irq_desc_ptrs array based on nr_irqs */
 	irq_desc_ptrs = kcalloc(nr_irqs, sizeof(void *), GFP_NOWAIT);
@@ -172,6 +172,9 @@ int __init early_irq_init(void)
 
 	for (i = 0; i < legacy_count; i++) {
 		desc[i].irq = i;
+#ifdef CONFIG_SMP
+		desc[i].node = node;
+#endif
 		desc[i].kstat_irqs = kstat_irqs_legacy + i * nr_cpu_ids;
 		lockdep_set_class(&desc[i].lock, &irq_desc_lock_class);
 		alloc_desc_masks(&desc[i], node, true);