Merge "Perf: Correct irq for CPU hotplug detection"