From owner-svn-src-stable@freebsd.org Fri Apr 24 14:27:24 2020 Return-Path: Delivered-To: svn-src-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 481EC2B6D98; Fri, 24 Apr 2020 14:27:24 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 497xMc19stz4RN3; Fri, 24 Apr 2020 14:27:24 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1F42A1F4A3; Fri, 24 Apr 2020 14:27:24 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03OERNfp013223; Fri, 24 Apr 2020 14:27:23 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03OERNVG013222; Fri, 24 Apr 2020 14:27:23 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202004241427.03OERNVG013222@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Fri, 24 Apr 2020 14:27:23 +0000 (UTC) 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 X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in stable/12/sys: arm64/arm64 riscv/riscv X-SVN-Commit-Revision: 360261 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Apr 2020 14:27:24 -0000 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); }