X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Firq%2Fproc.c;h=50b81b98046a9af5a6016376c72549ef7faf49f1;hb=c5ef91eee5015cc968996fb0d2974cbc41e4eccd;hp=b4f1674fca7987d8f99fa707eb2655cd20f0bc37;hpb=2a383c63ff933a496f19d6559ab54ac14871b7f3;p=linux-2.6

diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c
index b4f1674fca..50b81b9804 100644
--- a/kernel/irq/proc.c
+++ b/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;