From owner-dev-commits-src-branches@freebsd.org Wed Jul 21 12:09:50 2021 Return-Path: Delivered-To: dev-commits-src-branches@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 7E829662C38; Wed, 21 Jul 2021 12:09:50 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GVDsp2Nc1z3tbx; Wed, 21 Jul 2021 12:09:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 336861DC9E; Wed, 21 Jul 2021 12:09:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16LC9o2b044500; Wed, 21 Jul 2021 12:09:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16LC9oYu044499; Wed, 21 Jul 2021 12:09:50 GMT (envelope-from git) Date: Wed, 21 Jul 2021 12:09:50 GMT Message-Id: <202107211209.16LC9oYu044499@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: 4bce44bdac3e - stable/12 - arm: hide pc_mpidr behind #if __ARM_ARCH >= 6 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 4bce44bdac3e821630032ef13e80562c7919a66a Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jul 2021 12:09:50 -0000 The branch stable/12 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=4bce44bdac3e821630032ef13e80562c7919a66a commit 4bce44bdac3e821630032ef13e80562c7919a66a Author: Mateusz Guzik AuthorDate: 2021-07-21 12:06:34 +0000 Commit: Mateusz Guzik CommitDate: 2021-07-21 12:06:34 +0000 arm: hide pc_mpidr behind #if __ARM_ARCH >= 6 This is a direct commit. Unbreaks the build of: DB-78XXX DB-88F5XXX DB-88F6XXX RT1310 LINT-V5 TS7800 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/arm/arm/machdep.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c index a1354f303b3a..7aa19ceb3275 100644 --- a/sys/arm/arm/machdep.c +++ b/sys/arm/arm/machdep.c @@ -378,7 +378,9 @@ void cpu_pcpu_init(struct pcpu *pcpu, int cpuid, size_t size) { +#if __ARM_ARCH >= 6 pcpu->pc_mpidr = 0xffffffff; +#endif } void @@ -765,7 +767,9 @@ pcpu0_init(void) set_curthread(&thread0); #endif pcpu_init(pcpup, 0, sizeof(struct pcpu)); +#if __ARM_ARCH >= 6 pcpup->pc_mpidr = cp15_mpidr_get() & 0xFFFFFF; +#endif PCPU_SET(curthread, &thread0); }