From nobody Tue Jun 23 07:51:14 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 4gky1g5kV2z6jb5Q for ; Tue, 23 Jun 2026 07:51:19 +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 4gky1g41GHz3JKX for ; Tue, 23 Jun 2026 07:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782201079; 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=IjtvqmwTtAr+k31pHuVouU6jKBs5zzwlpCfBfYDlqDk=; b=wdzT4+puqcwRYes/576mFaOi6q0DqV1d98zmbKIZ0pNSA5a71q9M5x45THIObDfKWu/jpj x5ixgEMCzc+5A26IKVLtz2AMvgcyGEpHn0D7cbKa0mloe8YY6n8mtbCJBR0vqmfkUq+h7s uPtftCw2Nf1EkUpZgOJdV3Tu1ze+5z0aNHA9JGS5um3OyFVMXT976EwA+7aKuAvlMt0Bpr LSqsLtca14ygq3ZK8utXPpJW5LJ0iU69U3wlCoGzoDO5wCAuqkxYPdgDwtz9eWey2fln5c U0G6ampFiXZJcIclHRvqc1FNCFTJFHHMpwDrK/AxXFQJ5BVyYK5ro6vVeTbheQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782201079; a=rsa-sha256; cv=none; b=hFXk5tuWKOehbdBCY49TwBUxcwymYJSW5wGEk0RrJfpZLwN6ZneojNOX3GT+aDA6yOmB75 hOJx+2NtGJ3uNDJ9Y4mjU9kYaoL/dB5UiVjBsGiNCgh+6oIWr5PA1m33zkI3jsVN6/PqQJ n8Z5BPQtabJlqbcDyxi96IMnLhLMC9zcrgSEnH4I3ftk/X1V5SOfzyoRKVfMahIQ7TSwTO H8FWYyA50r5/CGDaGj+GyhCT5naMf3+5pVmPzg5W/733/eV75Zse71w0B8i1ObXPjPif/H MVQ8XQ0o5eW3XkQV4kIwSO3KqNN2Rj55OdfquUt13eKFK8qnIrQ4Llu4iAKlHw== 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=1782201079; 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=IjtvqmwTtAr+k31pHuVouU6jKBs5zzwlpCfBfYDlqDk=; b=bOFzvjXKF5zZF0rktHk+3Mt//Gtmq1GM/1sOisN/eoV+XL66z76UcN3lMl7E0WgnS38dtx kFs3aROOb0THmZvnQlZNvrYFxE9pwoLa6NWy+ZGiD8W2nLX5rq/ZnDzDLPMAgMZ+Q2zqU8 iZfjOxrPBBfO9vIRTe5816QvifWT+HYcg9Az25xDytXDTb/a2mL1AwhSo+m48ydNFLzQT3 O51a3dka8Y+thLx/tBOB8gQh8r+9rFFCQBAz93HfAjizZw7D/kGf8uDEv7RAqBfaKJPtV5 m2f5Xlefh6XJ1U4Kfequx2kBLxjaA4Pwt8DHqp1jAdhUyJRdJLWH0qK+SYGqIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gky1g2XQhz8WG for ; Tue, 23 Jun 2026 07:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fd82 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 07:51:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 01c8644093c2 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 01c8644093c28d09f0d41fb522dc53f1ab696a7e Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 07:51:14 +0000 Message-Id: <6a3a3af2.3fd82.49697213@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=01c8644093c28d09f0d41fb522dc53f1ab696a7e commit 01c8644093c28d09f0d41fb522dc53f1ab696a7e Author: Dag-Erling Smørgrav AuthorDate: 2026-06-23 07:51:01 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-23 07:51:01 +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 --- 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 ba64c39bc6b9..bf371f79ed86 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -91,6 +91,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 @@ -138,8 +150,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 @@ -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) diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 5f1e81b46129..44926bc2d3d5 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 55ef357248c5..ec46c91aaad2 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -90,9 +90,9 @@ include "std.debug" 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 @@ -102,6 +102,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 @@ -141,15 +153,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 @@ -158,15 +170,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)