Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Apr 2020 14:27:23 +0000 (UTC)
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r360261 - in stable/12/sys: arm64/arm64 riscv/riscv
Message-ID:  <202004241427.03OERNVG013222@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: markj
Date: Fri Apr 24 14:27:23 2020
New Revision: 360261
URL: https://svnweb.freebsd.org/changeset/base/360261

Log:
  Fix the build after r360259.
  
  stable/12 is missing r357940.  For some reason this warning wasn't hit
  when I compiled locally.
  
  This is a direct commit to stable/12.
  
  Reported by:	Jenkins

Modified:
  stable/12/sys/arm64/arm64/mp_machdep.c
  stable/12/sys/riscv/riscv/mp_machdep.c

Modified: stable/12/sys/arm64/arm64/mp_machdep.c
==============================================================================
--- stable/12/sys/arm64/arm64/mp_machdep.c	Fri Apr 24 13:53:40 2020	(r360260)
+++ stable/12/sys/arm64/arm64/mp_machdep.c	Fri Apr 24 14:27:23 2020	(r360261)
@@ -342,7 +342,7 @@ smp_after_idle_runnable(void *arg __unused)
 	for (cpu = 1; cpu < mp_ncpus; cpu++) {
 		if (bootstacks[cpu] != NULL) {
 			pc = pcpu_find(cpu);
-			while (atomic_load_ptr(&pc->pc_curpcb) == NULL)
+			while ((void *)atomic_load_ptr(&pc->pc_curpcb) == NULL)
 				cpu_spinwait();
 			kmem_free((vm_offset_t)bootstacks[cpu], PAGE_SIZE);
 		}

Modified: stable/12/sys/riscv/riscv/mp_machdep.c
==============================================================================
--- stable/12/sys/riscv/riscv/mp_machdep.c	Fri Apr 24 13:53:40 2020	(r360260)
+++ stable/12/sys/riscv/riscv/mp_machdep.c	Fri Apr 24 14:27:23 2020	(r360261)
@@ -304,7 +304,7 @@ smp_after_idle_runnable(void *arg __unused)
 	for (cpu = 1; cpu < mp_ncpus; cpu++) {
 		if (bootstacks[cpu] != NULL) {
 			pc = pcpu_find(cpu);
-			while (atomic_load_ptr(&pc->pc_curpcb) == NULL)
+			while ((void *)atomic_load_ptr(&pc->pc_curpcb) == NULL)
 				cpu_spinwait();
 			kmem_free((vm_offset_t)bootstacks[cpu], PAGE_SIZE);
 		}



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