From 957f2fa9c892d94bf57298c200d18105798018bf Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Sat, 21 Jul 2007 17:09:54 +0200
Subject: [PATCH] --- yaml --- r: 62353 b: refs/heads/master c:
 42ee2b74140b69fa24da1c671b03c9f8019e6f62 h: refs/heads/master i:   62351:
 3cd8587db67322940511dc3def868ae7dcb0547c v: v3

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

diff --git a/[refs] b/[refs]
index 710ad445fec5..d41580c14f42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78b599aed61a1098444558e74c93745f22eda6cb
+refs/heads/master: 42ee2b74140b69fa24da1c671b03c9f8019e6f62
diff --git a/trunk/kernel/irq/proc.c b/trunk/kernel/irq/proc.c
index b4f1674fca79..50b81b98046a 100644
--- a/trunk/kernel/irq/proc.c
+++ b/trunk/kernel/irq/proc.c
@@ -19,7 +19,15 @@ static struct proc_dir_entry *root_irq_dir;
 static int irq_affinity_read_proc(char *page, char **start, off_t off,
 				  int count, int *eof, void *data)
 {
-	int len = cpumask_scnprintf(page, count, irq_desc[(long)data].affinity);
+	struct irq_desc *desc = irq_desc + (long)data;
+	cpumask_t *mask = &desc->affinity;
+	int len;
+
+#ifdef CONFIG_GENERIC_PENDING_IRQ
+	if (desc->status & IRQ_MOVE_PENDING)
+		mask = &desc->pending_mask;
+#endif
+	len = cpumask_scnprintf(page, count, *mask);
 
 	if (count - len < 2)
 		return -EINVAL;