x86, irqinit: preempt merge conflicts