From nobody Tue Jan 24 22:13:54 2023 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 4P1h824C4Xz3bgdh; Tue, 24 Jan 2023 22:13:54 +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 4P1h823DmDz3Jky; Tue, 24 Jan 2023 22:13:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598434; 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=OI+3H+ug3t1FkiX02tjVuUAleY3fH6S4HUsbyJBbXQs=; b=eHuGoa7urrW7S6GNY690BWugq2rsahB9EkODpD/yPBeWqljTnXAgkgwAb2n4pz1FnECeo0 R99JZ8aEM5Qafc4+1gC2i8ibq0O264E6fQZVBYQ6+Bo/XL90imJO6v+foqvRSScCSvJirk R9XStgu6QstYIptK79U/2JPjC95mkEa1HkXZT/YZLp2KFcIcru302l0HjDUKD3k5ZGW+vf QPnD7FjH6nWdCVT1o3XHBoJuxYN0slxUlJqPi35YYN5frJqZPFj6NjchUeuRrZhRuyfhgQ N5r1Y3+8CM5Z/Rrjo7YZGFp6ZAWJ9FrlCP+mZVTKYVwrK7R0H/JEqT/xfK04FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598434; 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=OI+3H+ug3t1FkiX02tjVuUAleY3fH6S4HUsbyJBbXQs=; b=s43QzGiNq0gmmjFINLgh5ER+ClxM1FYgkodgTtQyRMlZ9gyoMKQ7C1N4niveQ+XbqzX5Ox D8T4bwv+VLPRLNs7ULQ88S4ArBpb+h2ImVq9EEfVHqkDI+FkIeToZQAmWPERAyNiVZGASI h11x3ZN8uHozQyGHuYUQ4ortHKceYVtS5adjJvYAlABYh71QqGPLxGwPbiopeh5/4/3LcG Ea3z9DABH3UW25ituL0ANcGXHUJ3W1KVtV17EyIlfQ8FZPOatCMbaWXbfNlYQTTYVTLfKL vpMy234640RVibP9PDW/SeY4ZqJRjW+rixwZ0oUnNqhLI+mPzYd2jraSJXjZYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598434; a=rsa-sha256; cv=none; b=yKZg/4ElfJ79X51PbPbWh5HTBP+0QdTBe7aEs3UozVHkhoO+MBJdWEwD2ojr05qAr86gmR mzeZOCqgbmQmS8CnvZC5RRYnU3wjMkVlaEBXexOAUxH6t2N+psh3O+n7lU9XborKeJ0CYK RlIqGabBDdZfaqjEprEOVn5+jofwfmkAutof8mVRA0Kdo0J3Chhzfx/FlIfXpyEHw0oyYE He1ueS9oN+oIC+j/nfa5ipTimuoIWYBKdxf/zB4PdPVLYAkxncxiv9qsJV8P1Dwk8e9jyO AvlheLFMNHghGmwqDNposERoHUqKGdPkMQDOqQC/akanT8RjOjqvrTJmbjZ/lA== 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 4P1h822B3gzQk5; Tue, 24 Jan 2023 22:13:54 +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 30OMDsMG089075; Tue, 24 Jan 2023 22:13:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMDsAG089074; Tue, 24 Jan 2023 22:13:54 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:13:54 GMT Message-Id: <202301242213.30OMDsAG089074@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 931e05ffc215 - stable/13 - kboot: Use #define for DT_DIR List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 931e05ffc2153449b2b66bd06603cf6f3e62dd1b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=931e05ffc2153449b2b66bd06603cf6f3e62dd1b commit 931e05ffc2153449b2b66bd06603cf6f3e62dd1b Author: Warner Losh AuthorDate: 2022-12-04 20:25:54 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:43 +0000 kboot: Use #define for DT_DIR Sponsored by: Netflix (cherry picked from commit 0ea00e71a2734caeb166287873b697d917e5a92d) --- stand/kboot/kbootfdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/kboot/kbootfdt.c b/stand/kboot/kbootfdt.c index df9506af6773..aafa436daf9f 100644 --- a/stand/kboot/kbootfdt.c +++ b/stand/kboot/kbootfdt.c @@ -58,7 +58,7 @@ add_node_to_fdt(void *buffer, const char *path, int fdt_offset) strcmp(dent->d_name, "..") == 0) continue; d_type = dent->d_type; - if (d_type == 4 /* DT_DIR */) { + if (d_type == HOST_DT_DIR) { child_offset = fdt_add_subnode(buffer, fdt_offset, dent->d_name); if (child_offset < 0) {