From owner-svn-src-stable-11@freebsd.org  Sun Oct  9 13:59:40 2016
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@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 1B1BAC07439;
 Sun,  9 Oct 2016 13:59:40 +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 DDE012F3;
 Sun,  9 Oct 2016 13:59:39 +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 u99Dxddc048992;
 Sun, 9 Oct 2016 13:59:39 GMT (envelope-from jmcneill@FreeBSD.org)
Received: (from jmcneill@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u99DxcYb048991;
 Sun, 9 Oct 2016 13:59:38 GMT (envelope-from jmcneill@FreeBSD.org)
Message-Id: <201610091359.u99DxcYb048991@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: Sun, 9 Oct 2016 13:59:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r306907 - stable/11/sys/arm/arm
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Oct 2016 13:59:40 -0000

Author: jmcneill
Date: Sun Oct  9 13:59:38 2016
New Revision: 306907
URL: https://svnweb.freebsd.org/changeset/base/306907

Log:
  MFC r306658: Clear GT_CTRL_ENABLE to stop the timer.

Modified:
  stable/11/sys/arm/arm/generic_timer.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/arm/arm/generic_timer.c
==============================================================================
--- stable/11/sys/arm/arm/generic_timer.c	Sun Oct  9 13:30:57 2016	(r306906)
+++ stable/11/sys/arm/arm/generic_timer.c	Sun Oct  9 13:59:38 2016	(r306907)
@@ -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);