From nobody Fri Jun 26 14:40:54 2026 X-Original-To: dev-commits-src-all@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 4gmyyt5TFhz6jbYT for ; Fri, 26 Jun 2026 14:40: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmyyt3QjHz3YNX for ; Fri, 26 Jun 2026 14:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782484854; 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=xdvMGwM/XRm4/xJxinp9AT8QAoHbClgGhKUsPG7/Rkw=; b=LHEopZb97mi54Ra8Eo1PXo+zWiu15HACehqVD9JsCfpaK/2st3nbLGJ20ZpNELgnvX74sB ALOkUzEm5igo35TXMYMbmoISpD6YaGeu9effF3i9O+x7YCRIwE7XlP5/9ufR482mjHcH6A rpr7baznz9WgCkHhd7lzUUBYiUKopgeuW9jHA9DapmWcgMR8y9X7XUpUxvB7cTHGOzGJZu woI1uP/ooXjJHSams+mb/p8iX5gh/92bdiN700wN8C6Jd/RkkdKcnt+qOVbU6wPypmdYRg QNWiXowSoGTtbyQLtK9w9pJcuhmSHiXhi8wAPiyB/Wo30vtWXu2f27VuElYlzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782484854; a=rsa-sha256; cv=none; b=QXVjlNziujXQFC/eCOijAMQ/pv6sV4QRtPv3/BJTjbfcDlAz4PfdrzlXQM0BisflF9CsDt C23wjGumGfJUaVdNqW+QQWE1fTn188i6QJV9NxjFg/L862apBFmChhLIbojdJ7UIU/QKPQ FLf/FEp0YqQjbkQVHPr9F3qnljWVvHbf15CFmXZbbet+18I3b7ChpJYzeb8mqNfhQXeapv 6TAQNBEQTRcRLCxGpSTcL5fkkmZ78WDlMjhCh9ClwKptNIZmSKfOIpKAWrz8FVO9dBS1S4 OCG/RZB+Ae1jGnQfkknQ9SXvf/BNp3HIybJ6Hnx7dzt9iL7ES2oTAb+i5Rj1Lg== 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=1782484854; 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=xdvMGwM/XRm4/xJxinp9AT8QAoHbClgGhKUsPG7/Rkw=; b=HbSQdkW2DshqgPIOVWJr2m0p6DVGAuLqQsWFYFqPgFr4n9LyrS0xwWcMwkXgtpaCTarrxF jLyW6ob01mU0UILuO9IO3k7Fb0wSjXYz1PGWy21N4uu4gWM+VFiHvvAksge4QVc+RdTaWf YrkkZsFbz27obgRl4bWWBFjKUHa0mHkaJoZZLk/prcrkipFdc0MCkanWcj+ueLXThjpC0f QoikwSzXHazTnrC/u6D+xUSF0LcVPN0eXBnGioKejcyKDdkRpE97NGtz1wOSvtY1iPi4dO f1X/RL2e/73SVCKUigoCBpGhDilNj4L4pC9BsOxDkn8HYf5fozD0EXD62GGgdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmyyt2MDLzhKf for ; Fri, 26 Jun 2026 14:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ecae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 14:40:54 +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: e2e736234437 - stable/15 - x86: Harmonize GENERIC and MINIMAL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/15 X-Git-Reftype: branch X-Git-Commit: e2e7362344375bcbb772c8ed77fcbaefffa36933 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 14:40:54 +0000 Message-Id: <6a3e8f76.1ecae.6441befa@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e2e7362344375bcbb772c8ed77fcbaefffa36933 commit e2e7362344375bcbb772c8ed77fcbaefffa36933 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-23 07:51:01 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-26 10:58:57 +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 | 26 +++++++++++++------------- sys/i386/conf/GENERIC | 1 + sys/i386/conf/MINIMAL | 34 +++++++++++++++++----------------- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index 595ff454f400..06680cf6c774 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -89,6 +89,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 @@ -129,8 +141,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 @@ -147,15 +159,3 @@ device xentimer # Xen x86 PV timer device options EVDEV_SUPPORT # evdev support in legacy drivers device evdev # input event device support device uinput # install /dev/uinput cdev - -# NVM Express (NVMe) support -device nvme # base NVMe driver - -# ATA controllers -device ahci # AHCI-compatible SATA controllers - -# CAM -device scbus # SCSI bus (required for ATA/SCSI) -device da # Direct Access (disks) -device cd # CD -device pass # Passthrough device (direct ATA/SCSI access) diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index a2f86753e945..dec49b37eecf 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -79,6 +79,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 fc04d4ed6dec..bcfe2642677d 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -88,9 +88,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 @@ -100,6 +100,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 @@ -139,15 +151,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 @@ -156,15 +168,3 @@ device xentimer # Xen x86 PV timer device options EVDEV_SUPPORT # evdev support in legacy drivers device evdev # input event device support device uinput # install /dev/uinput cdev - -# NVM Express (NVMe) support -device nvme # base NVMe driver - -# ATA controllers -device ahci # AHCI-compatible SATA controllers - -# CAM -device scbus # SCSI bus (required for ATA/SCSI) -device da # Direct Access (disks) -device cd # CD -device pass # Passthrough device (direct ATA/SCSI access)