diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-07 08:14:28 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-07 08:14:28 -0800 |
commit | 81e8d2162566379adcf4b3700f03845c62577145 (patch) | |
tree | abf52998d7a1b3cabb939abac590c27fa9c39f2a /kernel | |
parent | ff43fa8b41fe93cc62bb571a1bfeb487a3f79901 (diff) | |
parent | 25c9170ed64a6551beefe9315882f754e14486f4 (diff) | |
download | blackbird-op-linux-81e8d2162566379adcf4b3700f03845c62577145.tar.gz blackbird-op-linux-81e8d2162566379adcf4b3700f03845c62577145.zip |
Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
genirq: Fix incorrect proc spurious output
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/irq/proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c index 01b1d3a88983..6c8a2a9f8a7b 100644 --- a/kernel/irq/proc.c +++ b/kernel/irq/proc.c @@ -214,7 +214,7 @@ static int irq_spurious_proc_show(struct seq_file *m, void *v) static int irq_spurious_proc_open(struct inode *inode, struct file *file) { - return single_open(file, irq_spurious_proc_show, NULL); + return single_open(file, irq_spurious_proc_show, PDE(inode)->data); } static const struct file_operations irq_spurious_proc_fops = { |