From nobody Sun Apr 14 02:12:25 2024 X-Original-To: dev-commits-src-main@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 4VHDMs6dg8z5GlBZ; Sun, 14 Apr 2024 02:12:25 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VHDMs3qk9z4G2F; Sun, 14 Apr 2024 02:12:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713060745; 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=gYQarocnctB9iMBgl5l5GmITnjJjURqMqL3+9ZKserE=; b=Lmnrl4Vwc7IHdFBctd/pvvzYBSf38VK6Fnmp59u/vE+piODv+Q/JNYH8BiMLBl43DeJjY+ Ap6wfCzIk6nYC7RAeoPUZhukBLatOLN4Z63ij62GjLHeb6B/8LwaI+RDDGuOOERlSeBtgw j5h5rRtaIXpK6x4B9ik/p1oiJFowXDMKg5MovZa18JULqTM1QpvbPPw9pjPRlYVfTm8HG7 guzHaZYf9drJ0GxCd65POD/ynygvqdyCVtFY2pkwAA3Xw6y+aPjNAdPf+xooMG3OwVUcdI 353/7gQSYdQYohMsvwFeS1q68z0nku0DlrCsXNjBW0YhOFHEimR7q4RaF7pdOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713060745; a=rsa-sha256; cv=none; b=McCivYtaMFwu4h3hSYO9RQXgw/fXQkiJmIiG9dEvUXazvc1mRbAwY1wUD5osW0J5s6qS7C 9HN0wRmpQebtDC7l1gz5C7CwvG9y6Hf8qJixN28SBiNocEm4tVy525uk44gq7TIvB9tAql w1+bACNcnVZj5lrV8Mv4EwQ7Hr1jZrmrViUvtXMqGAD1vMkF+Bb0ZWUKRibykp2hcwnWhK hR0X31k/EnYsJbrkcwVsrLRjzpdYP/+DSapc2ygPd/FvW1b6fdm/HX8tzfsy4+sBKrAz8e x57b8QrIGHpA3I3+0RTSMhiBC+FhtXkyLF128jcCqxD6QNauHXeL8pu2yM2wuQ== 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=1713060745; 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=gYQarocnctB9iMBgl5l5GmITnjJjURqMqL3+9ZKserE=; b=vDO8Pezas1OawZIodhTaGDSnv/d9D4VUd8C9fGaDOJc1IOcYt2cG1SsURtVug9Ra7V0VYY EKauHLjMBwAz4I/8joBMjiW0OHf3P6Gw3aOyQjdMwhG5ZBcnho+iOAHUgRlvPjVXwfzHjU hoCNq1LepspjXv+4N/jmVSu+xcoN8O46X/Vu3m4dUkbvr6NBrciPWFs0v0MnYD3UOXHalN jsh28lI5RSkV+UPZuA4y9SilSRk+dn/EwrLE8xU/ZpmaJXH0G6erfBcDAtYSm4mpYyb2Ad tvGhHcapbyQf5XpKOfP8oYnAG6xxpwmtalCS8N22Y4CdJZgwrEDSPuB6gziW/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VHDMs39Cgzy2L; Sun, 14 Apr 2024 02:12:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43E2CP7l030401; Sun, 14 Apr 2024 02:12:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43E2CP7C030398; Sun, 14 Apr 2024 02:12:25 GMT (envelope-from git) Date: Sun, 14 Apr 2024 02:12:25 GMT Message-Id: <202404140212.43E2CP7C030398@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b620daf63309 - main - x86 NOTES: Move NKPT and PMAP_SHPGPERPROC options to VM OPTIONS section List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b620daf63309f655546caa060ea79cb230e4c9bc Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b620daf63309f655546caa060ea79cb230e4c9bc commit b620daf63309f655546caa060ea79cb230e4c9bc Author: John Baldwin AuthorDate: 2024-04-14 02:11:21 +0000 Commit: John Baldwin CommitDate: 2024-04-14 02:11:21 +0000 x86 NOTES: Move NKPT and PMAP_SHPGPERPROC options to VM OPTIONS section Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D44785 --- sys/amd64/conf/NOTES | 16 ++++++++-------- sys/i386/conf/NOTES | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index c99aae19f10e..49d2bec91364 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -554,14 +554,6 @@ options ENABLE_ALART # Control alarm on Intel intpm driver # device amdsmn -# -# Number of initial kernel page table pages used for early bootstrap. -# This number should include enough pages to map the kernel and any -# modules or other data loaded with the kernel by the loader. Each -# page table page maps 2MB. -# -options NKPT=31 - # EFI Runtime Services support options EFIRT @@ -596,6 +588,14 @@ options ZFS ##################################################################### # VM OPTIONS +# +# Number of initial kernel page table pages used for early bootstrap. +# This number should include enough pages to map the kernel and any +# modules or other data loaded with the kernel by the loader. Each +# page table page maps 2MB. +# +options NKPT=31 + # KSTACK_PAGES is the number of memory pages to assign to the kernel # stack of each thread. diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index dc3107349711..8f6098301b12 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -764,6 +764,22 @@ device superio # options ENABLE_ALART # Control alarm on Intel intpm driver +# +# HID-over-I2C support +# +device iichid # HID-over-I2C support +options IICHID_DEBUG # Enable HID-over-I2C debug messages +options IICHID_SAMPLING # Workaround missing GPIO INTR support + +##################################################################### +# ABI Emulation + +# Enable (32-bit) a.out binary support +options COMPAT_AOUT + +##################################################################### +# VM OPTIONS + # # Set the number of PV entries per process. Increasing this can # stop panics related to heavy use of shared memory. However, that can @@ -786,22 +802,6 @@ options PMAP_SHPGPERPROC=201 # options NKPT=31 -# -# HID-over-I2C support -# -device iichid # HID-over-I2C support -options IICHID_DEBUG # Enable HID-over-I2C debug messages -options IICHID_SAMPLING # Workaround missing GPIO INTR support - -##################################################################### -# ABI Emulation - -# Enable (32-bit) a.out binary support -options COMPAT_AOUT - -##################################################################### -# VM OPTIONS - # KSTACK_PAGES is the number of memory pages to assign to the kernel # stack of each thread.