From owner-svn-src-head@freebsd.org  Mon Feb 15 19:14:26 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 23725AA930B;
 Mon, 15 Feb 2016 19:14:26 +0000 (UTC)
 (envelope-from andrew@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 E54F89C2;
 Mon, 15 Feb 2016 19:14:25 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1FJEOhw085445;
 Mon, 15 Feb 2016 19:14:24 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1FJEOd5085444;
 Mon, 15 Feb 2016 19:14:24 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201602151914.u1FJEOd5085444@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Mon, 15 Feb 2016 19:14:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r295633 - 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-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Feb 2016 19:14:26 -0000

Author: andrew
Date: Mon Feb 15 19:14:24 2016
New Revision: 295633
URL: https://svnweb.freebsd.org/changeset/base/295633

Log:
  Set sc->clkfreq removed in r295470
  
  Reported by:	Jared McNeill <jmcneill@invisible.ca>
  Pointy-hat to:	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 Feb 15 18:14:21 2016	(r295632)
+++ head/sys/arm/arm/generic_timer.c	Mon Feb 15 19:14:24 2016	(r295633)
@@ -363,6 +363,8 @@ arm_tmr_attach(device_t dev)
 	if (node > 0) {
 		error = OF_getencprop(node, "clock-frequency", &clock,
 		    sizeof(clock));
+		if (error > 0)
+			sc->clkfreq = clock;
 	}
 #endif