From nobody Wed Apr 24 10:22:38 2024
X-Original-To: dev-commits-src-branches@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 4VPZmw3l87z5H3Rh;
Wed, 24 Apr 2024 10:22: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 4VPZmv66Gcz44gL;
Wed, 24 Apr 2024 10:22:39 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1713954159;
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=JaVhP/4nrrFtpmntWodgVS5EKxIFKS5jaZZ2gcIpNJQ=;
b=IY+s611O2VTsBdiz6yD3Z+CLdEBSR5uGwM0LKcyCtHl6KfYY9muvyHNd2rW0D55qhqqF6d
en5UU7U5fcljPd5wR7pLFXXGfewaVQhvMt4dGrQq+VyK1xLI5QjKv/mSVtZs3b/RjplAMC
whpiyNYdNX5Hfr0vRsFhQdrqEVsqpxVrr/W9hkUMvF4Puf/odXZ3xgWll74HoYVtjrKY68
shcJio4ZlB+X4n3Nld3Pl4ivuhVK3Q+J+emSL3awSE33mWp+gOkTjuW8sJQ8yExJVoiK/h
qQNEU1+CyIHBEAoP+6WoTNCobSzBKoRVJMIcZ2OCyN0Xq33+koYDeM4PV1TLQg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954159; a=rsa-sha256; cv=none;
b=uzAzo7G6gwSwSP0HHMyVRLSwHGeX3XXnXtG0PwJZWXJ3eG8hyfFjjcwtCXw7zKWNvEncIc
mpmOqL7/cPZg8SOuvi7p3AvAIzK1Ijmzqbx76YAO/Qg9lPTJb/JALwv5DdjNU3PoO/c4rp
Uy8AD8h0r8xasms9+8+IuR+1LaAVOVH1YthobOYE6MyvupNhEmv2xb8HbXceLkcHfHtB8e
dfBf2OWfPhHEzQujan9bSJOB1G7yEZ1J0uBeCBhv4M8GZBqX/efLoKkTNSy9id8uv6Uhhh
eIXvfbOaoswCVxGMBlezAPzpH553/epJkGzuyAuozXNinmjXRjlWyb1KAjKx+A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1713954159;
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=JaVhP/4nrrFtpmntWodgVS5EKxIFKS5jaZZ2gcIpNJQ=;
b=w5ebTCpzPOK5CBV3dmzmu4JHekSVnLzgeOUQDBV9AWdhrx+JPwbiiXgdblTZ9NAlSHlAM3
k5D26PH4z4wsY+8cnzqhqO4xXu8En9yXlhs2Bhv9Qzv9yk6rVgsp9/0Z9RBTdUQJs0n8GM
n4AcD4DH4mB1xUTC6MLqXevBeRqWoNY9Q46j+EjyPMVNKgZ8EjHdITr6shr5kkeiezLSbm
ZYY4X03PlwBSxXIfaaeOmkM45aSl88KweDuhb522eR2gDD4eOKeMNba7qKkoG5SwTonFBG
IDJF4L6fp5ltrGwfMvPICutSdPFI+8T8IMb+YbpeVOasqNbHhj1lVf5Cb/kldQ==
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 4VPZmv0Fd5z1B9t;
Wed, 24 Apr 2024 10:22:39 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43OAMcTg065919;
Wed, 24 Apr 2024 10:22:38 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OAMcHi065916;
Wed, 24 Apr 2024 10:22:38 GMT
(envelope-from git)
Date: Wed, 24 Apr 2024 10:22:38 GMT
Message-Id: <202404241022.43OAMcHi065916@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gordon Bergling <gbe@FreeBSD.org>
Subject: git: d7deb6833d29 - stable/12 - arm: Fix a typo in a KASSERT
message
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-branches@freebsd.org
Sender: owner-dev-commits-src-branches@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gbe
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: d7deb6833d2948edc63ce7005ae0e2d828561ecc
Auto-Submitted: auto-generated
The branch stable/12 has been updated by gbe:
URL: https://cgit.FreeBSD.org/src/commit/?id=d7deb6833d2948edc63ce7005ae0e2d828561ecc
commit d7deb6833d2948edc63ce7005ae0e2d828561ecc
Author: Gordon Bergling <gbe@FreeBSD.org>
AuthorDate: 2024-04-19 06:54:39 +0000
Commit: Gordon Bergling <gbe@FreeBSD.org>
CommitDate: 2024-04-24 10:22:24 +0000
arm: Fix a typo in a KASSERT message
- s/resoure/resource/
(cherry picked from commit 178cf4b9db4bb6726e845b10923788cf4e7a5ef0)
---
sys/arm/arm/gic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c
index 9ff0ec110b54..a660722fa6e0 100644
--- a/sys/arm/arm/gic.c
+++ b/sys/arm/arm/gic.c
@@ -439,7 +439,7 @@ arm_gic_alloc_resource(device_t bus, device_t child, int type, int *rid,
struct resource_list *rl;
int j;
- KASSERT(type == SYS_RES_MEMORY, ("Invalid resoure type %x", type));
+ KASSERT(type == SYS_RES_MEMORY, ("Invalid resource type %x", type));
sc = device_get_softc(bus);