From owner-svn-src-stable-10@freebsd.org  Wed Dec  2 12:58:21 2015
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A76BFA3FEDB;
 Wed,  2 Dec 2015 12:58:21 +0000 (UTC)
 (envelope-from royger@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6F79F1398;
 Wed,  2 Dec 2015 12:58:21 +0000 (UTC)
 (envelope-from royger@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB2CwKnj075719;
 Wed, 2 Dec 2015 12:58:20 GMT (envelope-from royger@FreeBSD.org)
Received: (from royger@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB2CwKo9075718;
 Wed, 2 Dec 2015 12:58:20 GMT (envelope-from royger@FreeBSD.org)
Message-Id: <201512021258.tB2CwKo9075718@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: royger set sender to
 royger@FreeBSD.org using -f
From: =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= <royger@FreeBSD.org>
Date: Wed, 2 Dec 2015 12:58:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r291647 - stable/10/sys/x86/xen
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Dec 2015 12:58:21 -0000

Author: royger
Date: Wed Dec  2 12:58:20 2015
New Revision: 291647
URL: https://svnweb.freebsd.org/changeset/base/291647

Log:
  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.

Modified:
  stable/10/sys/x86/xen/xen_intr.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/x86/xen/xen_intr.c
==============================================================================
--- stable/10/sys/x86/xen/xen_intr.c	Wed Dec  2 11:11:58 2015	(r291646)
+++ stable/10/sys/x86/xen/xen_intr.c	Wed Dec  2 12:58:20 2015	(r291647)
@@ -711,10 +711,7 @@ xen_intr_resume(struct pic *unused, bool
 				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;
 			}
 		}