From da45e6b967a16e5b390b51afe0d981bfae880818 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 31 Jan 2011 08:57:41 +0100
Subject: [PATCH] --- yaml --- r: 234684 b: refs/heads/master c:
 1fb0ef31f428f345a7c3666f8e7444a563edd537 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a83730f43287..f6679fe86d0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd7eab44e9946c28d595abe3e9a43e945bc49141
+refs/heads/master: 1fb0ef31f428f345a7c3666f8e7444a563edd537
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
index 0587c5ceaed8..538fce2db51c 100644
--- a/trunk/kernel/irq/manage.c
+++ b/trunk/kernel/irq/manage.c
@@ -179,7 +179,7 @@ static void irq_affinity_notify(struct work_struct *work)
 		cpumask_copy(cpumask, desc->pending_mask);
 	else
 #endif
-		cpumask_copy(cpumask, desc->affinity);
+		cpumask_copy(cpumask, desc->irq_data.affinity);
 	raw_spin_unlock_irqrestore(&desc->lock, flags);
 
 	notify->notify(notify, cpumask);