Did you compile test this with !CONFIG_XEN_HVM_PV? I think it would fail with xen_hvm_pv_evtchn_enabled() undefined. Fortunately making xen_hvm_pv_evtchn_enabled() evaluate to constant 0 in the !configed case will clean things up.