svn commit: r351448 - in head/sys: kern vm

[Mateusz Guzik]

Author: mjg
Date: Sat Aug 24 00:01:19 2019
New Revision: 351448
URL: https://svnweb.freebsd.org/changeset/base/351448

Log:
  Remove the obsolete pcpu_zone_ptr zone.
  
  It was only used by flowtable (removed in r321618).
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/kern/subr_pcpu.c
  head/sys/vm/uma.h

Modified: head/sys/kern/subr_pcpu.c
==============================================================================
--- head/sys/kern/subr_pcpu.c	Fri Aug 23 22:52:58 2019	(r351447)
+++ head/sys/kern/subr_pcpu.c	Sat Aug 24 00:01:19 2019	(r351448)
@@ -131,12 +131,10 @@ SYSINIT(dpcpu, SI_SUB_KLD, SI_ORDER_FIRST, dpcpu_start
 
 /*
  * UMA_PCPU_ZONE zones, that are available for all kernel
- * consumers. Right now 64 bit zone is used for counter(9)
- * and pointer zone is used by flowtable.
+ * consumers. Right now 64 bit zone is used for counter(9).
  */
 
 uma_zone_t pcpu_zone_64;
-uma_zone_t pcpu_zone_ptr;
 
 static void
 pcpu_zones_startup(void)
@@ -144,12 +142,6 @@ pcpu_zones_startup(void)
 
 	pcpu_zone_64 = uma_zcreate("64 pcpu", sizeof(uint64_t),
 	    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_PCPU);
-
-	if (sizeof(uint64_t) == sizeof(void *))
-		pcpu_zone_ptr = pcpu_zone_64;
-	else
-		pcpu_zone_ptr = uma_zcreate("ptr pcpu", sizeof(void *),
-		    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_PCPU);
 }
 SYSINIT(pcpu_zones, SI_SUB_VM, SI_ORDER_ANY, pcpu_zones_startup, NULL);
 

Modified: head/sys/vm/uma.h
==============================================================================
--- head/sys/vm/uma.h	Fri Aug 23 22:52:58 2019	(r351447)
+++ head/sys/vm/uma.h	Sat Aug 24 00:01:19 2019	(r351448)
@@ -650,7 +650,6 @@ int uma_zone_exhausted_nolock(uma_zone_t zone);
  * Common UMA_ZONE_PCPU zones.
  */
 extern uma_zone_t pcpu_zone_64;
-extern uma_zone_t pcpu_zone_ptr;
 
 /*
  * Exported statistics structures to be used by user space monitoring tools.