From owner-svn-src-all@freebsd.org  Sun May 15 13:21:00 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 AFDD5B3AC88;
 Sun, 15 May 2016 13:21:00 +0000 (UTC)
 (envelope-from manu@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 8206610AB;
 Sun, 15 May 2016 13:21:00 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4FDKxmf039761;
 Sun, 15 May 2016 13:20:59 GMT (envelope-from manu@FreeBSD.org)
Received: (from manu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4FDKx3x039760;
 Sun, 15 May 2016 13:20:59 GMT (envelope-from manu@FreeBSD.org)
Message-Id: <201605151320.u4FDKx3x039760@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: manu set sender to
 manu@FreeBSD.org using -f
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Sun, 15 May 2016 13:20:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r299851 - 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.22
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: Sun, 15 May 2016 13:21:00 -0000

Author: manu
Date: Sun May 15 13:20:59 2016
New Revision: 299851
URL: https://svnweb.freebsd.org/changeset/base/299851

Log:
  Allow arm generic_timer code to be included even if not present in the
  SoC.
  
  Reviewed by:	andrew
  Approved by:	cognet (mentor)
  Differential Revision:	https://reviews.freebsd.org/D6372

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

Modified: head/sys/arm/arm/generic_timer.c
==============================================================================
--- head/sys/arm/arm/generic_timer.c	Sun May 15 13:17:05 2016	(r299850)
+++ head/sys/arm/arm/generic_timer.c	Sun May 15 13:20:59 2016	(r299851)
@@ -214,7 +214,8 @@ static void
 tmr_setup_user_access(void *arg __unused)
 {
 
-	smp_rendezvous(NULL, setup_user_access, NULL, NULL);
+	if (arm_tmr_sc != NULL)
+		smp_rendezvous(NULL, setup_user_access, NULL, NULL);
 }
 SYSINIT(tmr_ua, SI_SUB_SMP, SI_ORDER_SECOND, tmr_setup_user_access, NULL);