From nobody Thu Aug 6 15:01:42 2026 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 4hG9Ty6Zvcz6nBPF for ; Thu, 06 Aug 2026 15:01:42 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hG9Ty3P5xz3Dpk for ; Thu, 06 Aug 2026 15:01:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786028502; 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=P3/1fm+4Do78HtsRkquOTKQ0ni8mjuq6iDFXbk2JbGk=; b=DpOiecjQ9dYS18q+CMFIniODPE+8UUZ7/qqdeouPiZ2/S6M51ILMmmB6mQIy3lVVcoCyeU 9o5A6yLqTrLs6UKgBsFIISkQw8uVcKmlGHXh7DwfOG6+uKCO6E49044Gjc7PlHD7IgmZqr ARgwiWbwxfA2zZvAkDwNhqenBpEkat+aJ+dL/zw077mr4hy9ZT08GeCyR+McuXWxYO5zST otwlVSBcItGOlHrA+7Wj7I8/ATcCupjVmMFSJJ89RtTnRVfodyZSg8vgFYVogDthysjKo6 kSTgBNX+hguLqWhYFAfhhODCoek9oNWK9SQBz9qXwvNU6lfc+9EyNwJAweRbqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786028502; a=rsa-sha256; cv=none; b=khy7dVMkqQCFI+X1qLe7VFP+SP1s46XYdL759EzRgTZUOqqxJwqZfpx/OlUp9KKWS3cYrG H3NoENgxPUQ44PmOCOXz+HgX/gq7nqUWlk2A7TjGET5eE9QnUCQs4r9roQ7Qc61Rk2qrlt vZyfzXPoQqnKReH7hks6JbXpxGHO/Ru3YMkogPaDqW3tKImVrNCMVheppfJNAkGlUzaSKu fBB2Uz20bpQey2uGrWueHs80mRNBXGTSpxTmP4aB6fTNk9ZlNzVvyKZvYNzPRW1LIsZmPv 5bSA7KSy+MS6lEWq6ZrG5uWjHgLJOI5nwdlZrp6cQpKSr81IO+v8BOkShjOdIw== 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=1786028502; 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=P3/1fm+4Do78HtsRkquOTKQ0ni8mjuq6iDFXbk2JbGk=; b=tT7zAr9QrFojn2fGDG7mNa1vsF95n9YBO6rMuoMudcgFasIQksJcjSC1uQkRR3Gcw8AVjZ /zNC82j+t+Jd4/pMZHiSVgjOorcNLQUHNpTCMys0dZLeiO7GeVbwLH9Pw4M2x8h2hapS8w JBcb6zBpwOPEU//BFpVe9FG6a5l8MXO0dD4qlThWhuGVkzXzXW3mA9HRhR7V7gG/Kk18HJ 3eG2h5y2QoOxfzcu6r+QkHYBhwf+H4ZsAMHdWeSwe9ozLKs9ck3Bovj9sNHkmoiipODJOy MF+Ap//wUo2Ysdlu+htw3ZhvdIV7cnpePBIjmimkMxGzFVQ4ghtWCeHJLEN/wg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hG9Ty1rkZz9ZY for ; Thu, 06 Aug 2026 15:01:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47412 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 06 Aug 2026 15:01:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 096b8244dad4 - stable/15 - vm: Make sure NULL is defined for vm_memattr_name() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 096b8244dad4b1af6665fc22a2065a1df2ea5fa1 Auto-Submitted: auto-generated Date: Thu, 06 Aug 2026 15:01:42 +0000 Message-Id: <6a74a1d6.47412.41f5902e@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=096b8244dad4b1af6665fc22a2065a1df2ea5fa1 commit 096b8244dad4b1af6665fc22a2065a1df2ea5fa1 Author: Mark Johnston AuthorDate: 2026-07-19 14:09:27 +0000 Commit: Mark Johnston CommitDate: 2026-08-06 13:24:43 +0000 vm: Make sure NULL is defined for vm_memattr_name() Fixes: a7e483ee146a ("vm_phys: Add a sysctl to dump registered fictitious memory ranges") (cherry picked from commit 11edc985cd9c2e1dcceccb7e929c6921b4e20c9b) --- sys/amd64/include/vm.h | 2 ++ sys/arm/include/vm.h | 2 ++ sys/arm64/include/vm.h | 2 ++ sys/i386/include/vm.h | 2 ++ sys/powerpc/include/vm.h | 2 ++ sys/riscv/include/vm.h | 2 ++ 6 files changed, 12 insertions(+) diff --git a/sys/amd64/include/vm.h b/sys/amd64/include/vm.h index 7219f8650a9f..60ed1d98daa2 100644 --- a/sys/amd64/include/vm.h +++ b/sys/amd64/include/vm.h @@ -44,6 +44,8 @@ #define VM_MEMATTR_DEVICE VM_MEMATTR_UNCACHEABLE #ifdef _KERNEL +#include + static inline const char * vm_memattr_name(vm_memattr_t memattr) { diff --git a/sys/arm/include/vm.h b/sys/arm/include/vm.h index 373f51adec82..867418cc7a06 100644 --- a/sys/arm/include/vm.h +++ b/sys/arm/include/vm.h @@ -42,6 +42,8 @@ #define VM_MEMATTR_WRITE_COMBINING VM_MEMATTR_WRITE_THROUGH /* for DRM */ #define VM_MEMATTR_WRITE_BACK VM_MEMATTR_WB_WA /* for DRM */ +#include + static inline const char * vm_memattr_name(vm_memattr_t memattr) { diff --git a/sys/arm64/include/vm.h b/sys/arm64/include/vm.h index 5ceaa9622aec..c9cef5ba1f2e 100644 --- a/sys/arm64/include/vm.h +++ b/sys/arm64/include/vm.h @@ -45,6 +45,8 @@ #define VM_MEMATTR_WRITE_COMBINING VM_MEMATTR_WRITE_THROUGH #ifndef LOCORE +#include + static inline const char * vm_memattr_name(vm_memattr_t memattr) { diff --git a/sys/i386/include/vm.h b/sys/i386/include/vm.h index 7219f8650a9f..60ed1d98daa2 100644 --- a/sys/i386/include/vm.h +++ b/sys/i386/include/vm.h @@ -44,6 +44,8 @@ #define VM_MEMATTR_DEVICE VM_MEMATTR_UNCACHEABLE #ifdef _KERNEL +#include + static inline const char * vm_memattr_name(vm_memattr_t memattr) { diff --git a/sys/powerpc/include/vm.h b/sys/powerpc/include/vm.h index 87d0faf44f2e..5374b076a086 100644 --- a/sys/powerpc/include/vm.h +++ b/sys/powerpc/include/vm.h @@ -43,6 +43,8 @@ #define VM_MEMATTR_DEVICE VM_MEMATTR_DEFAULT #ifdef _KERNEL +#include + static inline const char * vm_memattr_name(vm_memattr_t memattr) { diff --git a/sys/riscv/include/vm.h b/sys/riscv/include/vm.h index 66211fcc2580..60ba1b257bc4 100644 --- a/sys/riscv/include/vm.h +++ b/sys/riscv/include/vm.h @@ -39,6 +39,8 @@ #define VM_MEMATTR_TOTAL (VM_MEMATTR_LAST + 1) #ifdef _KERNEL +#include + static inline const char * vm_memattr_name(vm_memattr_t memattr) {