From nobody Mon Dec 20 18:10:36 2021 X-Original-To: dev-commits-src-all@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 5E70E190259D; Mon, 20 Dec 2021 18:10:37 +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 4JHngx0tDvz4Zpm; Mon, 20 Dec 2021 18:10:37 +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 F30381A9EE; Mon, 20 Dec 2021 18:10:36 +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 1BKIAaNT074404; Mon, 20 Dec 2021 18:10:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BKIAaxV074403; Mon, 20 Dec 2021 18:10:36 GMT (envelope-from git) Date: Mon, 20 Dec 2021 18:10:36 GMT Message-Id: <202112201810.1BKIAaxV074403@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: 29b24187ac37 - stable/12 - arm64: fix uintfptr_t List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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: 29b24187ac374d1ede6e48f0af6ddb8ff36d34c8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640023837; 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=JiO09MlLWKbM4X4cEk05G5SHUQYUU0CRIFEDHbtpuX4=; b=g038EfzWq+nLQ8Mxv3NN+F97oarJm7Wh9TObsVmXPa57VkAiF2CgMWwL6AytZ30HxhevPE RlZsW8+wF9xF4vHu0rD5N75Zs782S9duimYi/AS7NUQoI6N5/mUrUZWC4a9aOFPgFLjZTr GaQt0eAN5FaBCl7N5e1rOexbvtTVIwy05UGTf0ppSWMYekF49ogO5pz4htNl1tJNzTTGHL KKvd/6T2JVkx/Ut5P9ChCSYK174O0/PhucKeq5MFoEwefx/WGYOtOKm98+huyo8X44poSV Rldfz6O+ryUEynHsZmJwFN28gf36W006QAL3sxFGjCkbhsSjNYge5KyNXEIJSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640023837; a=rsa-sha256; cv=none; b=wUBc3HFaYFAsas40cVZ98RRruR+3lb1zDotFByVkiyjkEHmD4w/jGNYwkZisAqNmqkQDJq FKFZV0DIVj+zCu/vU2npgvh4iEllpQ/V24cIDx0KL7c9vQjniR8uZcIkSO914yy6T0U2bl d35XcQXrw66VoJBEQDwNEai5GlTMOTMnplw168paQh8ZFrpmqf34/XZBoEhmmiHc8QVkbi fA9tGgwFJf/eYS74JYVfR0ReAuKcIT9YlrPDvfWRnV59KT8i8HmYl8CsuGY5noW2jgc6T3 xssMv/a6/sSFRnTtemVUuM4dtg3n0G8EA8FQCohawa/OeHI3AV5az1SVfEBxkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=29b24187ac374d1ede6e48f0af6ddb8ff36d34c8 commit 29b24187ac374d1ede6e48f0af6ddb8ff36d34c8 Author: Mateusz Guzik AuthorDate: 2020-08-05 22:09:57 +0000 Commit: Mateusz Guzik CommitDate: 2021-12-20 18:09:33 +0000 arm64: fix uintfptr_t Fixes compilation after r363932 (cherry picked from commit 0ef3c62577fc37389ea46c9fc5accfb7706b6c01) Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/arm64/include/profile.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/include/profile.h b/sys/arm64/include/profile.h index 087af0504c75..afbfbdb44c0b 100644 --- a/sys/arm64/include/profile.h +++ b/sys/arm64/include/profile.h @@ -70,7 +70,7 @@ void mcount(uintfptr_t frompc, uintfptr_t selfpc); #else /* !_KERNEL */ -typedef unsigned long long uintfptr_t; +typedef __uintfptr_t uintfptr_t; #define _MCOUNT_DECL void mcount #define MCOUNT