| Message ID | 20210911034808.24252-5-me@ilammy.net (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | proc/stat: Maintain monotonicity of "intr" and "softirq" | expand |
diff --git a/arch/x86/include/asm/hardirq.h b/arch/x86/include/asm/hardirq.h index 461536b45391..3b0d79e72871 100644 --- a/arch/x86/include/asm/hardirq.h +++ b/arch/x86/include/asm/hardirq.h @@ -57,7 +57,7 @@ extern void ack_bad_irq(unsigned int irq); extern unsigned int arch_irq_stat_cpu(unsigned int cpu); #define arch_irq_stat_cpu arch_irq_stat_cpu -extern u64 arch_irq_stat(void); +extern unsigned int arch_irq_stat(void); #define arch_irq_stat arch_irq_stat diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index cefe1bc9f42c..18691ed499d1 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c @@ -218,9 +218,9 @@ unsigned int arch_irq_stat_cpu(unsigned int cpu) return sum; } -u64 arch_irq_stat(void) +unsigned int arch_irq_stat(void) { - u64 sum = atomic_read(&irq_err_count); + unsigned int sum = atomic_read(&irq_err_count); return sum; }
irq_err_count is atomic_t, extending it to u64 does not make the value wider, it's still unsigned int and will wrap around like unsigned int. Signed-off-by: Alexei Lozovsky <me@ilammy.net> --- arch/x86/include/asm/hardirq.h | 2 +- arch/x86/kernel/irq.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)