svn commit: r348648 - stable/12/sys/riscv/riscv

[Mark Johnston]

Author: markj
Date: Tue Jun  4 17:37:50 2019
New Revision: 348648
URL: https://svnweb.freebsd.org/changeset/base/348648

Log:
  MFC r340028 (by jhb):
  SBI calls expect a pointer to a u_long rather than a pointer.

Modified:
  stable/12/sys/riscv/riscv/intr_machdep.c
  stable/12/sys/riscv/riscv/mp_machdep.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/riscv/riscv/intr_machdep.c
==============================================================================
--- stable/12/sys/riscv/riscv/intr_machdep.c	Tue Jun  4 17:37:20 2019	(r348647)
+++ stable/12/sys/riscv/riscv/intr_machdep.c	Tue Jun  4 17:37:50 2019	(r348648)
@@ -202,7 +202,7 @@ riscv_unmask_ipi(void)
 static void
 ipi_send(struct pcpu *pc, int ipi)
 {
-	uintptr_t mask;
+	u_long mask;
 
 	CTR3(KTR_SMP, "%s: cpu=%d, ipi=%x", __func__, pc->pc_cpuid, ipi);
 
@@ -242,7 +242,7 @@ void
 ipi_selected(cpuset_t cpus, u_int ipi)
 {
 	struct pcpu *pc;
-	uintptr_t mask;
+	u_long mask;
 
 	CTR1(KTR_SMP, "ipi_selected: ipi: %x", ipi);
 

Modified: stable/12/sys/riscv/riscv/mp_machdep.c
==============================================================================
--- stable/12/sys/riscv/riscv/mp_machdep.c	Tue Jun  4 17:37:20 2019	(r348647)
+++ stable/12/sys/riscv/riscv/mp_machdep.c	Tue Jun  4 17:37:50 2019	(r348648)
@@ -182,7 +182,7 @@ riscv64_cpu_attach(device_t dev)
 static void
 release_aps(void *dummy __unused)
 {
-	uintptr_t mask;
+	u_long mask;
 	int cpu, i;
 
 	if (mp_ncpus == 1)