From nobody Thu Aug 25 12:18:40 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MD27N6MJRz4ZQD7; Thu, 25 Aug 2022 12:18:40 +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 4MD27N5lg0z41d0; Thu, 25 Aug 2022 12:18:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661429920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xwJs8A6yi8U6htEVMqNqebmUMZggnfLQp/XxHfx5pqo=; b=p4P1SjqKLUzRREh88mq/66ovldIJAXAq6cZtDvb3r5WgpMuHEAm9luSzChvh5duSDtseA3 WfiIGDn7QJYCb0S3U7ASX8aYQ4S/IX2Ckg0LHAH9SZKSGLjEgEjMo1kMTeQ/J5lqX73Gfd Ej8rID9Jqc2Sh5HEGk47YyOxTxltKuWCbpBcetSumr4frDyOQ67M7rrCjIQbAfZL9P5VME Ye/oQrszpzVtsgvjKWKGRYZeDbHe3FE+2qq+HmnwEa1qacAPxnBx8vWtwLW3h/wYYEe3L4 VhUidE1Fn+3otMqRvrHarmz43QOeVAqucTHP6o2a0g6wpspBuOS8fsk+cAYNAg== 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 4MD27N4mRhzn9Y; Thu, 25 Aug 2022 12:18:40 +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 27PCIeLi094726; Thu, 25 Aug 2022 12:18:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27PCIeXQ094725; Thu, 25 Aug 2022 12:18:40 GMT (envelope-from git) Date: Thu, 25 Aug 2022 12:18:40 GMT Message-Id: <202208251218.27PCIeXQ094725@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 5d0aebf4fa6d - main - Fix the arm generic timer on 32 bit List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d0aebf4fa6d85a2166dcb682f4a71cdd113c383 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661429920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xwJs8A6yi8U6htEVMqNqebmUMZggnfLQp/XxHfx5pqo=; b=lZTGRzeUCdRee3QJ5oXfbl72aFv3zVsMEPdrl8EiA02Yv6tVVRVODWn+9UxoqPkn8hyB65 Qzpte/+wgP/DeacOCeaJ+NG9tEm9SDo8QeMORm3zEnjTYx1cNvI6RULrAHpV6if4YhjtCK XksZMoFiSnFx/KVqrZWneT/D7AjKaRzLiC4wkm0bYDcRb17gh/OD94hEqeQMhfUTYoLCJX xokzwMLLLESWzx0b5KvXYaG8JfbTRp2q5aOtAGlYwtJbf2h+g5aXp+LJLl6OTHPx4+6Arn et1EB9fFLHnU/9KAXicP+lxrSwcjKD6OMPGWL3qXDU89PiMiksQmrlzTwMYi/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661429920; a=rsa-sha256; cv=none; b=RuPrrxREROvq66Rw6kl0dpwY42SxGkDIl20gCCig6ifGMjnw1hEyNYhUcfGWBlQZcrEDIK mLVvAHyZFZ1LUQVaa65b6B8Wf3m45RrErw+oLOEAtBsrpMqJbjyWRDznBqFcNBxGuOUIIY 85nQD0q36ALvrnNsiR0P+jAuwyegLv3MyGgy5wf6TBy+EnaAAvTrHZzkMsC7BpEpSmyAMq k62+1F09v4N1us5yezfXxMdC3JIwrN8jMrnLeBGzuV0ALgVhhMrWVsIKjz7d3HRZsWptSZ YFlOkR+B2ZOwVGgO+Ik7H9A1biSnxdV9ahAUvS93fxh9+Z6aPRsp8Sy1OkLXow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=5d0aebf4fa6d85a2166dcb682f4a71cdd113c383 commit 5d0aebf4fa6d85a2166dcb682f4a71cdd113c383 Author: Andrew Turner AuthorDate: 2022-08-25 12:17:11 +0000 Commit: Andrew Turner CommitDate: 2022-08-25 12:17:11 +0000 Fix the arm generic timer on 32 bit Hide a variable when we don't use it. Sponsored by: The FreeBSD Foundation --- sys/arm/arm/generic_timer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/arm/arm/generic_timer.c b/sys/arm/arm/generic_timer.c index 0c242a31d9a7..ebaadd5f38a8 100644 --- a/sys/arm/arm/generic_timer.c +++ b/sys/arm/arm/generic_timer.c @@ -274,7 +274,9 @@ cntpct_handler(vm_offset_t va, uint32_t insn, struct trapframe *frame, static void tmr_setup_user_access(void *arg __unused) { +#ifdef __aarch64__ int emulate; +#endif if (arm_tmr_sc != NULL) { smp_rendezvous(NULL, setup_user_access, NULL, NULL);