[tip:irq/core] genirq: Fix up irq_node() for irq_data changes.

From: tip-bot for Paul Mundt
Date: Thu Oct 28 2010 - 06:01:31 EST


Commit-ID: 4600d7c493f354a3e338a35bcf8a3bfbe815776a
Gitweb: http://git.kernel.org/tip/4600d7c493f354a3e338a35bcf8a3bfbe815776a
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
AuthorDate: Thu, 28 Oct 2010 11:30:31 +0900
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Thu, 28 Oct 2010 11:58:39 +0200

genirq: Fix up irq_node() for irq_data changes.

Now that the node ID is tracked in the irq_data structure, update the
irq_node() definition accordingly. This fixes up irq_node() usage under
GENERIC_HARDIRQS_NO_DEPRECATED && SMP.

Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
LKML-Reference: <20101028023031.GB10365@xxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>

---
include/linux/irqnr.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/irqnr.h b/include/linux/irqnr.h
index 05aa8c23..3bc4dca 100644
--- a/include/linux/irqnr.h
+++ b/include/linux/irqnr.h
@@ -43,7 +43,7 @@ unsigned int irq_get_next_irq(unsigned int offset);
else

#ifdef CONFIG_SMP
-#define irq_node(irq) (irq_to_desc(irq)->node)
+#define irq_node(irq) (irq_get_irq_data(irq)->node)
#else
#define irq_node(irq) 0
#endif
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/