From bb196eb4805e3df02e4ce377f918ff94bde40c1a Mon Sep 17 00:00:00 2001
From: Matthew D Fleming <mdf@FreeBSD.org>
Date: Fri, 26 Oct 2012 17:51:05 +0000
Subject: [PATCH] Const-ify the zone name argument to uma_zcreate(9).

MFC after:	3 days
---
 lib/libmemstat/memstat_uma.c | 2 +-
 sys/vm/uma.h                 | 6 +++---
 sys/vm/uma_core.c            | 4 ++--
 sys/vm/uma_int.h             | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/libmemstat/memstat_uma.c b/lib/libmemstat/memstat_uma.c
index 35f6dad45a46..040198c88a8c 100644
--- a/lib/libmemstat/memstat_uma.c
+++ b/lib/libmemstat/memstat_uma.c
@@ -254,7 +254,7 @@ kread(kvm_t *kvm, void *kvm_pointer, void *address, size_t size,
 }
 
 static int
-kread_string(kvm_t *kvm, void *kvm_pointer, char *buffer, int buflen)
+kread_string(kvm_t *kvm, const void *kvm_pointer, char *buffer, int buflen)
 {
 	ssize_t ret;
 	int i;
diff --git a/sys/vm/uma.h b/sys/vm/uma.h
index e17e6ef6d6d0..8a12fe18c0a7 100644
--- a/sys/vm/uma.h
+++ b/sys/vm/uma.h
@@ -165,9 +165,9 @@ typedef void (*uma_fini)(void *mem, int size);
  *	A pointer to a structure which is intended to be opaque to users of
  *	the interface.  The value may be null if the wait flag is not set.
  */
-uma_zone_t uma_zcreate(char *name, size_t size, uma_ctor ctor, uma_dtor dtor,
-			uma_init uminit, uma_fini fini, int align,
-			u_int32_t flags);
+uma_zone_t uma_zcreate(const char *name, size_t size, uma_ctor ctor,
+		    uma_dtor dtor, uma_init uminit, uma_fini fini,
+		    int align, u_int32_t flags);
 
 /*
  * Create a secondary uma zone
diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c
index 03def18aaf39..e58a86f38279 100644
--- a/sys/vm/uma_core.c
+++ b/sys/vm/uma_core.c
@@ -158,7 +158,7 @@ static struct callout uma_callout;
  * a special allocation function just for zones.
  */
 struct uma_zctor_args {
-	char *name;
+	const char *name;
 	size_t size;
 	uma_ctor ctor;
 	uma_dtor dtor;
@@ -1828,7 +1828,7 @@ uma_set_align(int align)
 
 /* See uma.h */
 uma_zone_t
-uma_zcreate(char *name, size_t size, uma_ctor ctor, uma_dtor dtor,
+uma_zcreate(const char *name, size_t size, uma_ctor ctor, uma_dtor dtor,
 		uma_init uminit, uma_fini fini, int align, u_int32_t flags)
 
 {
diff --git a/sys/vm/uma_int.h b/sys/vm/uma_int.h
index b2b5bac07fbc..d9d5394682bc 100644
--- a/sys/vm/uma_int.h
+++ b/sys/vm/uma_int.h
@@ -202,7 +202,7 @@ struct uma_keg {
 	struct mtx	uk_lock;	/* Lock for the keg */
 	struct uma_hash	uk_hash;
 
-	char		*uk_name;		/* Name of creating zone. */
+	const char	*uk_name;		/* Name of creating zone. */
 	LIST_HEAD(,uma_zone)	uk_zones;	/* Keg's zones */
 	LIST_HEAD(,uma_slab)	uk_part_slab;	/* partially allocated slabs */
 	LIST_HEAD(,uma_slab)	uk_free_slab;	/* empty slab list */
@@ -305,7 +305,7 @@ typedef struct uma_klink *uma_klink_t;
  *
  */
 struct uma_zone {
-	char		*uz_name;	/* Text name of the zone */
+	const char	*uz_name;	/* Text name of the zone */
 	struct mtx	*uz_lock;	/* Lock for the zone (keg's lock) */
 
 	LIST_ENTRY(uma_zone)	uz_link;	/* List of all zones in keg */