diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2023-08-07 21:49:57 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2023-08-14 20:17:48 +0000 |
| commit | a51f81c2e53f4968f5594822c44ed8da4d2416f6 (patch) | |
| tree | e0bfc60ff5d41d971a39d8fd864d09373a256e03 | |
| parent | d29b95ecc0d049406d27a6c11939d40a46658733 (diff) | |
| download | src-a51f81c2e53f4968f5594822c44ed8da4d2416f6.tar.gz src-a51f81c2e53f4968f5594822c44ed8da4d2416f6.zip | |
x86: move EARLY_AP_STARTUP into DEFAULTS
EARLY_AP_STARTUP was introduced in 2016 (commit fdce57a04219) with note:
As a transition aid, the new behavior is moved under a new
kernel option (EARLY_AP_STARTUP). This will allow the option
to be turned off if need be during initial testing. I hope to
enable this on x86 by default in a followup commit ...
It was enabled by default, but became effectively mandatory (on x86)
some time later. Move it to DEFAULTS to avoid an unbootable system if
the option is left out of a custom kernel configuration file.
Reported by: wollman
Reviewed by: jhb
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D41352
| -rw-r--r-- | sys/amd64/conf/DEFAULTS | 2 | ||||
| -rw-r--r-- | sys/amd64/conf/FIRECRACKER | 1 | ||||
| -rw-r--r-- | sys/amd64/conf/GENERIC | 1 | ||||
| -rw-r--r-- | sys/amd64/conf/MINIMAL | 1 | ||||
| -rw-r--r-- | sys/i386/conf/DEFAULTS | 2 | ||||
| -rw-r--r-- | sys/i386/conf/GENERIC | 1 | ||||
| -rw-r--r-- | sys/i386/conf/MINIMAL | 1 |
7 files changed, 4 insertions, 5 deletions
diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS index bc8a268e1ea4..7a3c54f974ab 100644 --- a/sys/amd64/conf/DEFAULTS +++ b/sys/amd64/conf/DEFAULTS @@ -5,6 +5,8 @@ machine amd64 +options EARLY_AP_STARTUP + # Bus support. device isa diff --git a/sys/amd64/conf/FIRECRACKER b/sys/amd64/conf/FIRECRACKER index ba00d674cf4e..b9cf11543245 100644 --- a/sys/amd64/conf/FIRECRACKER +++ b/sys/amd64/conf/FIRECRACKER @@ -115,7 +115,6 @@ options NETGDB # netgdb(4) client support # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel -options EARLY_AP_STARTUP # Pseudo devices. device crypto # core crypto support diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 822567ebe4bd..a3adb3ff8fd0 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -124,7 +124,6 @@ options NETGDB # netgdb(4) client support # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel -options EARLY_AP_STARTUP # CPU frequency control device cpufreq diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index b69706f97690..f52fbb375f6d 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -80,7 +80,6 @@ options KDB_TRACE # Print a stack trace for a panic. # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel -options EARLY_AP_STARTUP # CPU frequency control device cpufreq diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS index f4956183b85c..8ed95641af6f 100644 --- a/sys/i386/conf/DEFAULTS +++ b/sys/i386/conf/DEFAULTS @@ -5,6 +5,8 @@ machine i386 +options EARLY_AP_STARTUP + # Bus support. device isa options ISAPNP diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index d2bc5b195963..877898777749 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -109,7 +109,6 @@ options NETGDB # netgdb(4) client support # To make an SMP kernel, the next two lines are needed options SMP # Symmetric MultiProcessor Kernel device apic # I/O APIC -options EARLY_AP_STARTUP # CPU frequency control device cpufreq diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL index d939201d85a9..a2aab1660209 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -88,7 +88,6 @@ options KDB_TRACE # Print a stack trace for a panic. # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel -options EARLY_AP_STARTUP device apic # CPU frequency control |