From owner-svn-src-all@freebsd.org  Fri Mar 18 16:29:59 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 4C1C3AD4A70;
 Fri, 18 Mar 2016 16:29:59 +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 1E80AE55;
 Fri, 18 Mar 2016 16:29:59 +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 u2IGTwrJ002172;
 Fri, 18 Mar 2016 16:29:58 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2IGTwaY002170;
 Fri, 18 Mar 2016 16:29:58 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201603181629.u2IGTwaY002170@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: Fri, 18 Mar 2016 16:29:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r297029 - in head/sys/arm64: arm64 include
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.21
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: Fri, 18 Mar 2016 16:29:59 -0000

Author: andrew
Date: Fri Mar 18 16:29:58 2016
New Revision: 297029
URL: https://svnweb.freebsd.org/changeset/base/297029

Log:
  Rename COUNT_IPI to INTR_IPI_COUNT to reduce the diff with intrng.
  
  Obtained from:	ABT Systems Ltd
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/arm64/arm64/mp_machdep.c
  head/sys/arm64/include/smp.h

Modified: head/sys/arm64/arm64/mp_machdep.c
==============================================================================
--- head/sys/arm64/arm64/mp_machdep.c	Fri Mar 18 16:18:29 2016	(r297028)
+++ head/sys/arm64/arm64/mp_machdep.c	Fri Mar 18 16:29:58 2016	(r297029)
@@ -179,7 +179,7 @@ release_aps(void *dummy __unused)
 	int cpu, i;
 
 	/* Setup the IPI handler */
-	for (i = 0; i < COUNT_IPI; i++)
+	for (i = 0; i < INTR_IPI_COUNT; i++)
 		arm_setup_ipihandler(ipi_handler, i);
 
 	atomic_store_rel_int(&aps_ready, 1);
@@ -238,7 +238,7 @@ init_secondary(uint64_t cpu)
 	/* Configure the interrupt controller */
 	arm_init_secondary();
 
-	for (i = 0; i < COUNT_IPI; i++)
+	for (i = 0; i < INTR_IPI_COUNT; i++)
 		arm_unmask_ipi(i);
 
 	/* Start per-CPU event timers. */
@@ -277,7 +277,7 @@ ipi_handler(void *arg)
 	u_int cpu, ipi;
 
 	arg = (void *)((uintptr_t)arg & ~(1 << 16));
-	KASSERT((uintptr_t)arg < COUNT_IPI,
+	KASSERT((uintptr_t)arg < INTR_IPI_COUNT,
 	    ("Invalid IPI %ju", (uintptr_t)arg));
 
 	cpu = PCPU_GET(cpuid);

Modified: head/sys/arm64/include/smp.h
==============================================================================
--- head/sys/arm64/include/smp.h	Fri Mar 18 16:18:29 2016	(r297028)
+++ head/sys/arm64/include/smp.h	Fri Mar 18 16:29:58 2016	(r297029)
@@ -42,7 +42,7 @@ enum {
 	IPI_STOP,
 	IPI_STOP_HARD,
 	IPI_HARDCLOCK,
-	COUNT_IPI,
+	INTR_IPI_COUNT,
 };
 
 void	ipi_all_but_self(u_int ipi);