Commit a3d763f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_irq_for_6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 irq updates from Dave Hansen:
 "Add Hyper-V interrupts to /proc/stat"

* tag 'x86_irq_for_6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/irq: Add hardcoded hypervisor interrupts to /proc/stat
parents 941d77c7 504dba50

arch/x86/kernel/irq.c

+7 −0
Original line number Diff line number Diff line
@@ -211,6 +211,13 @@ u64 arch_irq_stat_cpu(unsigned int cpu) 
#ifdef CONFIG_X86_MCE_THRESHOLD

	sum += irq_stats(cpu)->irq_threshold_count;

#endif

#ifdef CONFIG_X86_HV_CALLBACK_VECTOR

	sum += irq_stats(cpu)->irq_hv_callback_count;

#endif

#if IS_ENABLED(CONFIG_HYPERV)

	sum += irq_stats(cpu)->irq_hv_reenlightenment_count;

	sum += irq_stats(cpu)->hyperv_stimer0_count;

#endif

#ifdef CONFIG_X86_MCE

	sum += per_cpu(mce_exception_count, cpu);

	sum += per_cpu(mce_poll_count, cpu);