The patch titled
x86-expand-proc-interrupts-to-include-missing-vectors-v2 fix
has been added to the -mm tree. Its filename is
x86-expand-proc-interrupts-to-include-missing-vectors-v2-fix.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: x86-expand-proc-interrupts-to-include-missing-vectors-v2 fix
From: Joe Korty <joe.korty@xxxxxxxx>
spurs are what cowboys wear.
Cc: Joe Korty <joe.korty@xxxxxxxx>
Cc: Tim Hockin <thockin@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/i386/kernel/apic.c | 2 +-
arch/i386/kernel/irq.c | 2 +-
arch/x86_64/kernel/apic.c | 2 +-
arch/x86_64/kernel/irq.c | 2 +-
include/asm-i386/hardirq.h | 2 +-
include/asm-x86_64/pda.h | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff -puN arch/i386/kernel/apic.c~x86-expand-proc-interrupts-to-include-missing-vectors-v2-fix arch/i386/kernel/apic.c
--- a/arch/i386/kernel/apic.c~x86-expand-proc-interrupts-to-include-missing-vectors-v2-fix
+++ a/arch/i386/kernel/apic.c
@@ -1280,7 +1280,7 @@ void smp_spurious_interrupt(struct pt_re
printk(KERN_INFO "spurious APIC interrupt on CPU#%d, "
"should never happen.\n", smp_processor_id());
irq_exit();
- __get_cpu_var(irq_stat).irq_spur_counts++;
+ __get_cpu_var(irq_stat).irq_spurious_counts++;
}
/*
diff -puN arch/i386/kernel/irq.c~x86-expand-proc-interrupts-to-include-missing-vectors-v2-fix arch/i386/kernel/irq.c
--- a/arch/i386/kernel/irq.c~x86-expand-proc-interrupts-to-include-missing-vectors-v2-fix
+++ a/arch/i386/kernel/irq.c
@@ -321,7 +321,7 @@ skip:
seq_printf(p, "SPU: ");
for_each_online_cpu(j)
seq_printf(p, "%10u ",
- per_cpu(irq_stat,j).irq_spur_counts);
+ per_cpu(irq_stat,j).irq_spurious_counts);
seq_printf(p, " Spurious interrupts\n");
seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
#if defined(CONFIG_X86_IO_APIC)
diff -puN arch/x86_64/kernel/apic.c~x86-expand-proc-interrupts-to-include-missing-vectors-v2-fix arch/x86_64/kernel/apic.c
--- a/arch/x86_64/kernel/apic.c~x86-expand-proc-interrupts-to-include-missing-vectors-v2-fix
+++ a/arch/x86_64/kernel/apic.c
@@ -1154,7 +1154,7 @@ asmlinkage void smp_spurious_interrupt(v
ack_APIC_irq();
irq_exit();
- add_pda(irq_spur_counts, 1);
+ add_pda(irq_spurious_counts, 1);
}
/*
diff -puN arch/x86_64/kernel/irq.c~x86-expand-proc-interrupts-to-include-missing-vectors-v2-fix arch/x86_64/kernel/irq.c
--- a/arch/x86_64/kernel/irq.c~x86-expand-proc-interrupts-to-include-missing-vectors-v2-fix
+++ a/arch/x86_64/kernel/irq.c
@@ -121,7 +121,7 @@ skip:
seq_printf(p, " Threshold APIC interrupts\n");
seq_printf(p, "SPU: ");
for_each_online_cpu(j)
- seq_printf(p, "%10u ", cpu_pda(j)->irq_spur_counts);
+ seq_printf(p, "%10u ", cpu_pda(j)->irq_spurious_counts);
seq_printf(p, " Spurious interrupts\n");
seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
}
diff -puN include/asm-i386/hardirq.h~x86-expand-proc-interrupts-to-include-missing-vectors-v2-fix include/asm-i386/hardirq.h
--- a/include/asm-i386/hardirq.h~x86-expand-proc-interrupts-to-include-missing-vectors-v2-fix
+++ a/include/asm-i386/hardirq.h
@@ -13,7 +13,7 @@ typedef struct {
unsigned int irq_call_counts;
unsigned int irq_tlb_counts;
unsigned int irq_thermal_counts;
- unsigned int irq_spur_counts;
+ unsigned int irq_spurious_counts;
} ____cacheline_aligned irq_cpustat_t;
DECLARE_PER_CPU(irq_cpustat_t, irq_stat);
diff -puN include/asm-x86_64/pda.h~x86-expand-proc-interrupts-to-include-missing-vectors-v2-fix include/asm-x86_64/pda.h
--- a/include/asm-x86_64/pda.h~x86-expand-proc-interrupts-to-include-missing-vectors-v2-fix
+++ a/include/asm-x86_64/pda.h
@@ -34,7 +34,7 @@ struct x8664_pda {
unsigned irq_tlb_counts;
unsigned irq_thermal_counts;
unsigned irq_threshold_counts;
- unsigned irq_spur_counts;
+ unsigned irq_spurious_counts;
} ____cacheline_aligned_in_smp;
extern struct x8664_pda *_cpu_pda[];
_
Patches currently in -mm which might be from joe.korty@xxxxxxxx are
x86-expand-proc-interrupts-to-include-missing-vectors-v2.patch
x86-expand-proc-interrupts-to-include-missing-vectors-v2-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
