Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 25 Mar 2018 16:56:49 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r331532 - head/sys/crypto/ccp
Message-ID:  <201803251656.w2PGunC0061278@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: imp
Date: Sun Mar 25 16:56:49 2018
New Revision: 331532
URL: https://svnweb.freebsd.org/changeset/base/331532

Log:
  The PNP info has to follow the module definition. Move it from just
  after the array to its proper location. Otherwise, the linker.hints
  file has things out of order and we associated it with whatever was
  the previous module.

Modified:
  head/sys/crypto/ccp/ccp.c

Modified: head/sys/crypto/ccp/ccp.c
==============================================================================
--- head/sys/crypto/ccp/ccp.c	Sun Mar 25 08:55:53 2018	(r331531)
+++ head/sys/crypto/ccp/ccp.c	Sun Mar 25 16:56:49 2018	(r331532)
@@ -79,8 +79,6 @@ static struct pciid {
 	{ 0x14561022, "AMD CCP-5a" },
 	{ 0x14681022, "AMD CCP-5b" },
 };
-MODULE_PNP_INFO("W32:vendor/device", pci, ccp, ccp_ids, sizeof(ccp_ids[0]),
-    nitems(ccp_ids));
 
 static struct random_source random_ccp = {
 	.rs_ident = "AMD CCP TRNG",
@@ -783,6 +781,8 @@ DRIVER_MODULE(ccp, pci, ccp_driver, ccp_devclass, NULL
 MODULE_VERSION(ccp, 1);
 MODULE_DEPEND(ccp, crypto, 1, 1, 1);
 MODULE_DEPEND(ccp, random_device, 1, 1, 1);
+MODULE_PNP_INFO("W32:vendor/device", pci, ccp, ccp_ids, sizeof(ccp_ids[0]),
+    nitems(ccp_ids));
 
 static int
 ccp_queue_reserve_space(struct ccp_queue *qp, unsigned n, int mflags)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803251656.w2PGunC0061278>