diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-11 09:36:25 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-11 09:36:25 -0400 |
| commit | a8931ef380c92d121ae74ecfb03b2d63f72eea6f (patch) | |
| tree | 980fb6b019e11e6cb1ece55b7faff184721a8053 /arch/s390/kernel/irq.c | |
| parent | 90574d0a4d4b73308ae54a2a57a4f3f1fa98e984 (diff) | |
| parent | e5a5816f7875207cb0a0a7032e39a4686c5e10a4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/s390/kernel/irq.c')
| -rw-r--r-- | arch/s390/kernel/irq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c index c59a86dca584..e7c5bfb7c755 100644 --- a/arch/s390/kernel/irq.c +++ b/arch/s390/kernel/irq.c | |||
| @@ -25,6 +25,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
| 25 | static const char *intrclass_names[] = { "EXT", "I/O", }; | 25 | static const char *intrclass_names[] = { "EXT", "I/O", }; |
| 26 | int i = *(loff_t *) v, j; | 26 | int i = *(loff_t *) v, j; |
| 27 | 27 | ||
| 28 | get_online_cpus(); | ||
| 28 | if (i == 0) { | 29 | if (i == 0) { |
| 29 | seq_puts(p, " "); | 30 | seq_puts(p, " "); |
| 30 | for_each_online_cpu(j) | 31 | for_each_online_cpu(j) |
| @@ -43,7 +44,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
| 43 | seq_putc(p, '\n'); | 44 | seq_putc(p, '\n'); |
| 44 | 45 | ||
| 45 | } | 46 | } |
| 46 | 47 | put_online_cpus(); | |
| 47 | return 0; | 48 | return 0; |
| 48 | } | 49 | } |
| 49 | 50 | ||