diff options
-rw-r--r-- | fs/proc/stat.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/proc/stat.c b/fs/proc/stat.c index 3cb9492801c0..3bb1cf1e7425 100644 --- a/fs/proc/stat.c +++ b/fs/proc/stat.c | |||
@@ -27,7 +27,6 @@ static int show_stat(struct seq_file *p, void *v) | |||
27 | u64 sum = 0; | 27 | u64 sum = 0; |
28 | struct timespec boottime; | 28 | struct timespec boottime; |
29 | unsigned int per_irq_sum; | 29 | unsigned int per_irq_sum; |
30 | struct irq_desc *desc; | ||
31 | 30 | ||
32 | user = nice = system = idle = iowait = | 31 | user = nice = system = idle = iowait = |
33 | irq = softirq = steal = cputime64_zero; | 32 | irq = softirq = steal = cputime64_zero; |
@@ -47,8 +46,7 @@ static int show_stat(struct seq_file *p, void *v) | |||
47 | guest = cputime64_add(guest, kstat_cpu(i).cpustat.guest); | 46 | guest = cputime64_add(guest, kstat_cpu(i).cpustat.guest); |
48 | for_each_irq_nr(j) { | 47 | for_each_irq_nr(j) { |
49 | #ifdef CONFIG_SPARSE_IRQ | 48 | #ifdef CONFIG_SPARSE_IRQ |
50 | desc = irq_to_desc(j); | 49 | if (!irq_to_desc(j)) |
51 | if (!desc) | ||
52 | continue; | 50 | continue; |
53 | #endif | 51 | #endif |
54 | sum += kstat_irqs_cpu(j, i); | 52 | sum += kstat_irqs_cpu(j, i); |
@@ -98,8 +96,7 @@ static int show_stat(struct seq_file *p, void *v) | |||
98 | for_each_irq_nr(j) { | 96 | for_each_irq_nr(j) { |
99 | per_irq_sum = 0; | 97 | per_irq_sum = 0; |
100 | #ifdef CONFIG_SPARSE_IRQ | 98 | #ifdef CONFIG_SPARSE_IRQ |
101 | desc = irq_to_desc(j); | 99 | if (!irq_to_desc(j)) { |
102 | if (!desc) { | ||
103 | seq_printf(p, " %u", per_irq_sum); | 100 | seq_printf(p, " %u", per_irq_sum); |
104 | continue; | 101 | continue; |
105 | } | 102 | } |