From 1b04dcdfa7b5e42e464878eca0bbb3236498629b Mon Sep 17 00:00:00 2001
From: jhb <jhb@FreeBSD.org>
Date: Thu, 11 Nov 2010 16:06:47 +0000
Subject: [PATCH] Fix a few more places to use cpumask_t rather than 'u_int'. 
 These are just cosmetic.

---
 sys/sun4v/include/pmap.h     |  5 ++---
 sys/sun4v/include/smp.h      | 12 ++++++------
 sys/sun4v/sun4v/mp_machdep.c |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/sys/sun4v/include/pmap.h b/sys/sun4v/include/pmap.h
index 6acebb40d624..aa3f9e1301bc 100644
--- a/sys/sun4v/include/pmap.h
+++ b/sys/sun4v/include/pmap.h
@@ -54,7 +54,6 @@
 #define TSB_MAX_RESIZE          (20 - TSB_INIT_SHIFT - PAGE_SHIFT)
 
 typedef	struct pmap *pmap_t;
-typedef uint32_t pmap_cpumask_t;
 
 struct pv_entry;
 struct tte_hash;
@@ -77,8 +76,8 @@ struct pmap {
 	struct hv_tsb_info      pm_tsb;
 	uint32_t		pm_gen_count;	/* generation count (pmap lock dropped) */
 	u_int			pm_retries;
-	pmap_cpumask_t          pm_active;      /* mask of cpus currently using pmap */
-	pmap_cpumask_t          pm_tlbactive;   /* mask of cpus that have used this pmap */
+	cpumask_t		pm_active;      /* mask of cpus currently using pmap */
+	cpumask_t		pm_tlbactive;   /* mask of cpus that have used this pmap */
 	struct	pmap_statistics pm_stats;
 	uint32_t                pm_tsb_miss_count;
 	uint32_t                pm_tsb_cap_miss_count;
diff --git a/sys/sun4v/include/smp.h b/sys/sun4v/include/smp.h
index 3202089cbf15..c075cacfa86f 100644
--- a/sys/sun4v/include/smp.h
+++ b/sys/sun4v/include/smp.h
@@ -75,7 +75,7 @@ struct pcpu;
 void	cpu_mp_bootstrap(struct pcpu *pc);
 void	cpu_mp_shutdown(void);
 
-void	cpu_ipi_selected(int cpus, uint16_t *cpulist, u_long d0, u_long d1, u_long d2, uint64_t *ackmask);
+void	cpu_ipi_selected(int cpu_count, uint16_t *cpulist, u_long d0, u_long d1, u_long d2, uint64_t *ackmask);
 void	cpu_ipi_send(u_int mid, u_long d0, u_long d1, u_long d2);
 
 void cpu_ipi_ast(struct trapframe *tf);
@@ -85,7 +85,7 @@ void cpu_ipi_hardclock(struct trapframe *tf);
 
 void	ipi_all_but_self(u_int ipi);
 void	ipi_cpu(int cpu, u_int ipi);
-void	ipi_selected(u_int cpus, u_int ipi);
+void	ipi_selected(cpumask_t cpus, u_int ipi);
 
 vm_offset_t mp_tramp_alloc(void);
 void        mp_set_tsb_desc_ra(vm_paddr_t);
@@ -149,7 +149,7 @@ static __inline void *
 ipi_tlb_context_demap(struct pmap *pm)
 {
 	struct ipi_tlb_args *ita;
-	u_int cpus;
+	cpumask_t cpus;
 
 	if (smp_cpus == 1)
 		return (NULL);
@@ -168,7 +168,7 @@ static __inline void *
 ipi_tlb_page_demap(struct pmap *pm, vm_offset_t va)
 {
 	struct ipi_tlb_args *ita;
-	u_int cpus;
+	cpumask_t cpus;
 
 	if (smp_cpus == 1)
 		return (NULL);
@@ -187,7 +187,7 @@ static __inline void *
 ipi_tlb_range_demap(struct pmap *pm, vm_offset_t start, vm_offset_t end)
 {
 	struct ipi_tlb_args *ita;
-	u_int cpus;
+	cpumask_t cpus;
 
 	if (smp_cpus == 1)
 		return (NULL);
@@ -206,7 +206,7 @@ ipi_tlb_range_demap(struct pmap *pm, vm_offset_t start, vm_offset_t end)
 static __inline void
 ipi_wait(void *cookie)
 {
-	volatile u_int *mask;
+	volatile cpumask_t *mask;
 
 	if ((mask = cookie) != NULL) {
 		atomic_clear_int(mask, PCPU_GET(cpumask));
diff --git a/sys/sun4v/sun4v/mp_machdep.c b/sys/sun4v/sun4v/mp_machdep.c
index a9535e34d779..961d40c93bd6 100644
--- a/sys/sun4v/sun4v/mp_machdep.c
+++ b/sys/sun4v/sun4v/mp_machdep.c
@@ -539,7 +539,7 @@ cpu_ipi_selected(int cpu_count, uint16_t *cpulist, u_long d0, u_long d1, u_long
 }
 
 void
-ipi_selected(u_int icpus, u_int ipi)
+ipi_selected(cpumask_t icpus, u_int ipi)
 {
 	int i, cpu_count;
 	uint16_t *cpulist;