From nobody Tue Jan 13 16:27:23 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 4drF5X3rc1z6NMRQ for ; Tue, 13 Jan 2026 16:27:28 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4drF5X23xQz3Ktl for ; Tue, 13 Jan 2026 16:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768321648; 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=aUf2vcqUSW4ymyeg7LQPItmwJlzdhKB7vFoGg/X1XsI=; b=AqMaXPzio4apOHkwNKZqY5xNk7WeV9/CR9OV8hvbWeyiDi0i2SYpnWki9/2Yf8+7DAxIlw a6cyG1guVgn+HkBrMPicoTyMXV2fFS+Ntaa+zmMhW4jWF8l+RdXgtHPC+ilOQI4/f5/fRd uNxe/PmnLEHufGULlG9IoYTQdeXfiqsWC/FIpPSAJb7YKTaezLXv+LXSruYtjGI54MyQm6 oTJ+XnwgiAPA8bHDRRDQk4rIi1J3+OTs+GSmh5rbHoz6N+gka9hHtSqAI067qAkNQ90Xhk kVEB7PwmUwKv8wjX4ODBv2/bqn1bjsU7jNXbUy74tSqed9jOLwO2/vFo1AKiTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768321648; 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=aUf2vcqUSW4ymyeg7LQPItmwJlzdhKB7vFoGg/X1XsI=; b=KSEnZhIDzwgwljcJU5J5EovjzoyXmoMA8LhTevriANobXKVnwquyesYrzv1eol3q05jbDk yC0ljtnlLxEyIRedM+USVu0S7MTzDQvRtaWsccUVQTbEBssm9WVDuFps0Z6O8iP/GuLRS9 rTRKuH+F1q/oWP9qBsfR6uEhjS6K1x/b3ax/TI5Pju6EEfBFZMbibK48qw/UeznHbY+QMm edvWF7THQoMUPFhvH4BHdF2Ekn1rjlluhLFEUEajsMdcMLEFzC6kqCPe8MBAFTMk4mzMnH ONHigTFgQq4iIlsGnvTP+PuyiRDXlklLKApeDAtFy4BU0K16ugOR+WtmCK3dDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768321648; a=rsa-sha256; cv=none; b=gflyXAD+MAOWSQb/LA6W8P3bjLXJGzOaNhw8jEhO7rumEsNeI4DZUy0qnxIrMGqennYRbq gbx5cRC8gl2JtWXf/DE0cQCYRXZWEFHlJYvbqBKPHwSshdrqwZanvNQixdmjsSxY5oYRua g++2oCYH0hgoc/5lE5yALZGTGTE3emJXoUC8ZwA6R5QllPEbOafXS6tbgNwODXwwU4XpwL MfjacWCN/AfDtMLWdtwotfy0yAGUuckIXn6wVLq5O8wC5DnLjGwhyQfCKEUobJLutGnqko PBa7fAGpcxzAEOz7KxhR9xJywUUyFLEE7m40eSKudrZYkDFcYDG9vRO/m1DFkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4drF5R1bcXz3lv for ; Tue, 13 Jan 2026 16:27:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30cc4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 13 Jan 2026 16:27:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 859b585f4bae - stable/15 - sys/conf: Fix arm64 vmm_nvhe dependencies 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 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 859b585f4bae779751be664ef415562805ee683c Auto-Submitted: auto-generated Date: Tue, 13 Jan 2026 16:27:23 +0000 Message-Id: <6966726b.30cc4.8fe690d@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=859b585f4bae779751be664ef415562805ee683c commit 859b585f4bae779751be664ef415562805ee683c Author: Andrew Turner AuthorDate: 2025-09-22 17:10:12 +0000 Commit: Andrew Turner CommitDate: 2026-01-13 14:06:18 +0000 sys/conf: Fix arm64 vmm_nvhe dependencies These files include a vmm_hyp equivalent file but don't have a dependency recorded. Fix this by manually adding this dependency. This is only a problem in a non-GENERIC configuration as normally vmm is loaded as vmm.ko. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D51822 (cherry picked from commit fe1d344bf416aa921b4bf233668dda7cf4e27444) --- sys/conf/files.arm64 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 45966fea8041..856ea3af1372 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -127,9 +127,11 @@ arm64/vmm/vmm_reset.c optional vmm arm64/vmm/vmm_handlers.c optional vmm arm64/vmm/vmm_call.S optional vmm arm64/vmm/vmm_nvhe_exception.S optional vmm \ + dependency "$S/arm64/vmm/vmm_hyp_exception.S" \ compile-with "${NOSAN_C} -fpie" \ no-obj arm64/vmm/vmm_nvhe.c optional vmm \ + dependency "$S/arm64/vmm/vmm_hyp.c" \ compile-with "${NOSAN_C} -fpie" \ no-obj vmm_hyp_blob.elf.full optional vmm \