summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroyger <royger@FreeBSD.org>2015-12-02 12:58:20 +0000
committerroyger <royger@FreeBSD.org>2015-12-02 12:58:20 +0000
commit904bdb8bc249483f4b14b6df43fb361e87b438da (patch)
tree1609448a6f5fc763187fb9a151838742e4d567ee
parentb1833e15625d0430c3295929d57b86e1959c9f6b (diff)
downloadFreeBSD-src-904bdb8bc249483f4b14b6df43fb361e87b438da.zip
FreeBSD-src-904bdb8bc249483f4b14b6df43fb361e87b438da.tar.gz
Revert MFC of r291023:
Due to the delta between HEAD and stable/10 event channel code, this fix is not needed on stable/10 and was also causing build issues. Revert it.
-rw-r--r--sys/x86/xen/xen_intr.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c
index 20ebad5..fd36e68 100644
--- a/sys/x86/xen/xen_intr.c
+++ b/sys/x86/xen/xen_intr.c
@@ -711,10 +711,7 @@ xen_intr_resume(struct pic *unused, bool suspend_cancelled)
xen_rebind_virq(isrc);
break;
default:
- intr_remove_handler(isrc->xi_cookie);
isrc->xi_cpu = 0;
- isrc->xi_type = EVTCHN_TYPE_UNBOUND;
- isrc->xi_cookie = NULL;
break;
}
}
OpenPOWER on IntegriCloud