x86: move EARLY_AP_STARTUP into DEFAULTS
EARLY_AP_STARTUP was introduced in 2016 (commit fdce57a042) 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
This commit is contained in:
@@ -5,6 +5,8 @@
|
||||
|
||||
machine amd64
|
||||
|
||||
options EARLY_AP_STARTUP
|
||||
|
||||
# Bus support.
|
||||
device isa
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
|
||||
machine i386
|
||||
|
||||
options EARLY_AP_STARTUP
|
||||
|
||||
# Bus support.
|
||||
device isa
|
||||
options ISAPNP
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user