From nobody Fri Jun 26 14:41:15 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 4gmyzJ2Q7Yz6jbZq for ; Fri, 26 Jun 2026 14:41:16 +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 4gmyzH3SwTz3Ynr for ; Fri, 26 Jun 2026 14:41:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782484875; 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=V9hbHX5tri0X/Jm1+zlDWtTBQz5OZxrPOYpWp32BubM=; b=VcMK0VeYcxWEkTdg2nRG8rrk/iaQ6Jt72aaAWeM8UVh1D4nFUVO+seckIf9zQD0mrGikMS 9OjPLVAf03EMb5eMuZ6H0ti9aUA9teu35TGwFK3u5vm5iC/wpYIcu7w6ao+ft4fdbemUmT O0rMfo0A4iitIy21a6k5vau55QGI95g8vfle5HQuYm3oaONnGQ8TMHQNGPMCGLR6ZA706m f0jcrrCaH4iIt7rp5Yv6QrJpcLkL60PhW3V+qtwC0szYKm3YpsSZSD8rkJMFg76HHvidWA SXes/hhTULdf/GYW6HlUkcSHYqn4ua9ugCr229KPF0zDb3aAM7vhyq9vZHcvFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782484875; a=rsa-sha256; cv=none; b=qSC2zX7/0kXlRH/RURZGnCLSnc0lHNJZcZIUqchWKn/01usOvrmRz54+8HJn1/hxtiAwIT rusTUWcwVhCAoAe730lOf1hygHHQ2VzUGN9c03w4kC/EbgRbm0rmvFXkTJhNTf+RjNPh21 MojEvacqGChXvuCgqY1XUnQ91Mp9sChOzLSsTa6wOgSo3LeTm2cakr6s4PGVtSzJQAHYtQ ryDvg7vwJSgqfzCCjD6xzMKEgS4Gt1HctGpBB4jb5bwKMK5kQt3YWafDKzE7tU6g65RE37 TB/fww4s9OV3DhkhxG0VNG9G+LTg6GcJLAoP0way2yW+SEBzi44SrHFosHf/7g== 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=1782484875; 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=V9hbHX5tri0X/Jm1+zlDWtTBQz5OZxrPOYpWp32BubM=; b=U7GWztrCwNcfMewb9H0CGGFg1BS/neFtrSuZpo/o7f37i8IfPE+rfhSsJnjLeSt4DZR4yE 8Jj64/IKHCBw6PtT5InZk7K8s8jq8v7kxaH3xcnsWnkycIahpGvIPdt7U6WhFM0tm7GUTZ E0D0kxNj1o4+WgGobpeIjL/Wuak4tbCwOWCrGcLKJlY14150HzXyF9n9I4gT0IzBdkhLA5 hE3LEncWRlYbMl0NmXXNfG9F4s44L1CHDrtJ8GFdWQHRSoUekaJTCrMBT0CcZO69U2njZa /ePiayFQidY1O58EFeem20g1A43U7arxQmqtRpEWjQRf6OUtmRAPwFxrTSe0Ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmyzH2JcvzhKm for ; Fri, 26 Jun 2026 14:41:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d45d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 14:41:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: f523af0e05a5 - stable/14 - x86: Harmonize GENERIC and MINIMAL 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f523af0e05a5a7e1aa9a872e165d9dcf3b60ad18 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 14:41:15 +0000 Message-Id: <6a3e8f8b.1d45d.6edb641f@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f523af0e05a5a7e1aa9a872e165d9dcf3b60ad18 commit f523af0e05a5a7e1aa9a872e165d9dcf3b60ad18 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-23 07:51:01 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-26 14:41:06 +0000 x86: Harmonize GENERIC and MINIMAL * Reorder MINIMAL so everything is in the same order as in GENERIC. * Wherever comments diverged, except for the explanatory comment at the top, copy the GENERIC version to MINIMAL. * Add KDTRACE_FRAME to i386 GENERIC; it was already in MINIMAL, and adding it to GENERIC seemed like the more correct move. With these changes, MINIMAL is a strict subset of GENERIC, apart from the identifier and the explanatory comment at the top. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D57729 (cherry picked from commit 01c8644093c28d09f0d41fb522dc53f1ab696a7e) --- sys/amd64/conf/MINIMAL | 14 +++++++++++++- sys/i386/conf/GENERIC | 1 + sys/i386/conf/MINIMAL | 22 +++++++++++++++++----- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index 000bfc2ab9a6..45e905898115 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -92,6 +92,18 @@ device acpi options IOMMU device pci +# ATA controllers +device ahci # AHCI-compatible SATA controllers + +# ATA/SCSI peripherals +device scbus # SCSI bus (required for ATA/SCSI) +device da # Direct Access (disks) +device cd # CD +device pass # Passthrough device (direct ATA/SCSI access) + +# NVM Express (NVMe) support +device nvme # base NVMe driver + # atkbdc0 controls both the keyboard and the PS/2 mouse device atkbdc # AT keyboard controller device atkbd # AT keyboard @@ -132,8 +144,8 @@ device virtio # Generic VirtIO bus (required) device virtio_pci # VirtIO PCI device device vtnet # VirtIO Ethernet device device virtio_blk # VirtIO Block device -device virtio_balloon # VirtIO Memory Balloon device device virtio_scsi # VirtIO SCSI device +device virtio_balloon # VirtIO Memory Balloon device # Linux KVM paravirtualization support device kvm_clock # KVM paravirtual clock driver diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 10d6a67a7ac2..89b6b9bbac3b 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -76,6 +76,7 @@ options AUDIT # Security event auditing options CAPABILITY_MODE # Capsicum capability mode options CAPABILITIES # Capsicum capabilities options MAC # TrustedBSD MAC Framework +options KDTRACE_FRAME # Ensure frames are compiled in options KDTRACE_HOOKS # Kernel DTrace hooks options DDB_CTF # Kernel ELF linker loads CTF data options INCLUDE_CONFIG_FILE # Include this file in kernel diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL index b8d654151a95..a488c32cd8dd 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -89,9 +89,9 @@ options KDB_TRACE # Print a stack trace for a panic. options GZIO # gzip (dumps) options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) -# Make an SMP-capable kernel by default +# To make an SMP kernel, the next two lines are needed options SMP # Symmetric MultiProcessor Kernel -device apic +device apic # I/O APIC # CPU frequency control device cpufreq @@ -101,6 +101,18 @@ device acpi device smbios device pci +# ATA controllers +device ahci # AHCI-compatible SATA controllers + +# ATA/SCSI peripherals +device scbus # SCSI bus (required for ATA/SCSI) +device da # Direct Access (disks) +device cd # CD +device pass # Passthrough device (direct ATA/SCSI access) + +# NVM Express (NVMe) support +device nvme # base NVMe driver + # atkbdc0 controls both the keyboard and the PS/2 mouse device atkbdc # AT keyboard controller device atkbd # AT keyboard @@ -140,15 +152,15 @@ device virtio # Generic VirtIO bus (required) device virtio_pci # VirtIO PCI device device vtnet # VirtIO Ethernet device device virtio_blk # VirtIO Block device -device virtio_balloon # VirtIO Memory Balloon device device virtio_scsi # VirtIO SCSI device +device virtio_balloon # VirtIO Memory Balloon device # Linux KVM paravirtualization support device kvm_clock # KVM paravirtual clock driver # Xen HVM Guest Optimizations -# NOTE: XENHVM depends on xenpci and xentimer. -# They must be added or removed together. +# NOTE: XENHVM and xenpci interdepend. They must be added or removed +# together. xentimer depends on XENHVM and isn't required. options XENHVM # Xen HVM kernel infrastructure device xenpci # Xen HVM Hypervisor services driver device xentimer # Xen x86 PV timer device