From owner-svn-src-all@freebsd.org  Thu Feb 15 15:46:15 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 388C2F02889;
 Thu, 15 Feb 2018 15:46:15 +0000 (UTC)
 (envelope-from cognet@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id D1B2E7EDCE;
 Thu, 15 Feb 2018 15:46:14 +0000 (UTC)
 (envelope-from cognet@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C83C820B73;
 Thu, 15 Feb 2018 15:46:14 +0000 (UTC)
 (envelope-from cognet@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1FFkEi2095746;
 Thu, 15 Feb 2018 15:46:14 GMT (envelope-from cognet@FreeBSD.org)
Received: (from cognet@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1FFkEBb095745;
 Thu, 15 Feb 2018 15:46:14 GMT (envelope-from cognet@FreeBSD.org)
Message-Id: <201802151546.w1FFkEBb095745@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cognet set sender to
 cognet@FreeBSD.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Thu, 15 Feb 2018 15:46:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r329317 - head/sys/arm/arm
X-SVN-Group: head
X-SVN-Commit-Author: cognet
X-SVN-Commit-Paths: head/sys/arm/arm
X-SVN-Commit-Revision: 329317
X-SVN-Commit-Repository: base
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.25
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: Thu, 15 Feb 2018 15:46:15 -0000

Author: cognet
Date: Thu Feb 15 15:46:14 2018
New Revision: 329317
URL: https://svnweb.freebsd.org/changeset/base/329317

Log:
  Rename the ACPI variant of the gicv2m driver from "gicv2m" to "gicv2m_acpi".
  The FDT variant is called "gicv2m" too, and as both would try to register
  on gic, only one of them would succeed, while we want them both in a
  GENERIC kernel.
  
  Reviewed by:	andrew

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

Modified: head/sys/arm/arm/gic_acpi.c
==============================================================================
--- head/sys/arm/arm/gic_acpi.c	Thu Feb 15 15:33:17 2018	(r329316)
+++ head/sys/arm/arm/gic_acpi.c	Thu Feb 15 15:46:14 2018	(r329317)
@@ -342,5 +342,5 @@ DEFINE_CLASS_1(gicv2m, arm_gicv2m_acpi_driver, arm_gic
 
 static devclass_t arm_gicv2m_acpi_devclass;
 
-EARLY_DRIVER_MODULE(gicv2m, gic, arm_gicv2m_acpi_driver,
+EARLY_DRIVER_MODULE(gicv2m_acpi, gic, arm_gicv2m_acpi_driver,
     arm_gicv2m_acpi_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);