From owner-svn-src-all@freebsd.org  Mon Oct  3 21:42:06 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 E4B4CAF3047;
 Mon,  3 Oct 2016 21:42:06 +0000 (UTC)
 (envelope-from jmcneill@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 B290AB5A;
 Mon,  3 Oct 2016 21:42:06 +0000 (UTC)
 (envelope-from jmcneill@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u93Lg5t1022911;
 Mon, 3 Oct 2016 21:42:05 GMT (envelope-from jmcneill@FreeBSD.org)
Received: (from jmcneill@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u93Lg5q6022910;
 Mon, 3 Oct 2016 21:42:05 GMT (envelope-from jmcneill@FreeBSD.org)
Message-Id: <201610032142.u93Lg5q6022910@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jmcneill set sender to
 jmcneill@FreeBSD.org using -f
From: Jared McNeill <jmcneill@FreeBSD.org>
Date: Mon, 3 Oct 2016 21:42:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r306658 - head/sys/arm/arm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Oct 2016 21:42:07 -0000

Author: jmcneill
Date: Mon Oct  3 21:42:05 2016
New Revision: 306658
URL: https://svnweb.freebsd.org/changeset/base/306658

Log:
  Clear GT_CTRL_ENABLE to stop the timer.
  
  Reviewed by:	andrew

Modified:
  head/sys/arm/arm/generic_timer.c

Modified: head/sys/arm/arm/generic_timer.c
==============================================================================
--- head/sys/arm/arm/generic_timer.c	Mon Oct  3 20:48:18 2016	(r306657)
+++ head/sys/arm/arm/generic_timer.c	Mon Oct  3 21:42:05 2016	(r306658)
@@ -259,7 +259,7 @@ arm_tmr_stop(struct eventtimer *et)
 	sc = (struct arm_tmr_softc *)et->et_priv;
 
 	ctrl = get_ctrl(sc->physical);
-	ctrl &= GT_CTRL_ENABLE;
+	ctrl &= ~GT_CTRL_ENABLE;
 	set_ctrl(ctrl, sc->physical);
 
 	return (0);