2014-11-09 11:23:04

by Antti Tönkyrä

[permalink] [raw]
Subject: [PATCH] x86: Fix duplicate abbreviation in irq.c

Commit 929320e4b4c10708d3477d7e395f0ce7b0cc8744 introduces accounting
for hypervisor callback vector. However, I think there was a small
oversight because the new vector has abbreviation THR which makes no
sense to me at all because it collides with threshold interrupt and
subsequently causes some tools behave badly because they rely on
uniqueness of the first field in /proc/interrupts.

This commit renames the duplicate THR to HCI.

Signed-off-by: Antti Tönkyrä <[email protected]>
---
arch/x86/kernel/irq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 922d285..3579b27 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -127,7 +127,7 @@ int arch_show_interrupts(struct seq_file *p, int prec)
seq_printf(p, " Machine check polls\n");
#endif
#if IS_ENABLED(CONFIG_HYPERV) || defined(CONFIG_XEN)
- seq_printf(p, "%*s: ", prec, "THR");
+ seq_printf(p, "%*s: ", prec, "HCI");
for_each_online_cpu(j)
seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
seq_printf(p, " Hypervisor callback interrupts\n");
--
2.0.4