The branch main has been updated by khng:
URL:
https://cgit.FreeBSD.org/src/commit/?id=ee09ce3f1f2e8d98d48c65f6af74d269f71b0d48
commit ee09ce3f1f2e8d98d48c65f6af74d269f71b0d48
Author: Ka Ho Ng <k...@freebsd.org>
AuthorDate: 2025-08-02 17:57:07 +0000
Commit: Ka Ho Ng <k...@freebsd.org>
CommitDate: 2025-08-02 17:58:13 +0000
Revert "amd64: include opt_kstack_pages.h"
This reverts commit d5ec97156d3314f979629968f76151c2d35a1e62.
The commit broke the build.
Reported by: des
---
sys/amd64/amd64/locore.S | 5 ++---
sys/amd64/amd64/pmap.c | 1 -
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
index 62f5ee2a6998..2be555b25160 100644
--- a/sys/amd64/amd64/locore.S
+++ b/sys/amd64/amd64/locore.S
@@ -30,14 +30,13 @@
* SUCH DAMAGE.
*/
-#include "assym.inc"
-#include "opt_kstack_pages.h"
-
#include <machine/asmacros.h>
#include <machine/psl.h>
#include <machine/pmap.h>
#include <machine/specialreg.h>
+#include "assym.inc"
+
/*
* Compiled KERNBASE location
*/
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 243a6625bece..4cf77ee75871 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -104,7 +104,6 @@
*/
#include "opt_ddb.h"
-#include "opt_kstack_pages.h"
#include "opt_pmap.h"
#include "opt_vm.h"
