diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /arch/x86/kernel/irq.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'arch/x86/kernel/irq.c')
| -rw-r--r-- | arch/x86/kernel/irq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index 61521dc19c10..9f669fdd2010 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c | |||
| @@ -102,8 +102,7 @@ int arch_show_interrupts(struct seq_file *p, int prec) | |||
| 102 | seq_puts(p, " Rescheduling interrupts\n"); | 102 | seq_puts(p, " Rescheduling interrupts\n"); |
| 103 | seq_printf(p, "%*s: ", prec, "CAL"); | 103 | seq_printf(p, "%*s: ", prec, "CAL"); |
| 104 | for_each_online_cpu(j) | 104 | for_each_online_cpu(j) |
| 105 | seq_printf(p, "%10u ", irq_stats(j)->irq_call_count - | 105 | seq_printf(p, "%10u ", irq_stats(j)->irq_call_count); |
| 106 | irq_stats(j)->irq_tlb_count); | ||
| 107 | seq_puts(p, " Function call interrupts\n"); | 106 | seq_puts(p, " Function call interrupts\n"); |
| 108 | seq_printf(p, "%*s: ", prec, "TLB"); | 107 | seq_printf(p, "%*s: ", prec, "TLB"); |
| 109 | for_each_online_cpu(j) | 108 | for_each_online_cpu(j) |