git: b8606c3406ea - main - arm64: Fix the includes for rsi.c

From: Andrew Turner <andrew_at_FreeBSD.org>
Date: Thu, 14 May 2026 09:48:08 UTC
The branch main has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=b8606c3406eab69637be616260c977c9a8f14ff3

commit b8606c3406eab69637be616260c977c9a8f14ff3
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2026-05-14 08:31:06 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2026-05-14 09:25:14 +0000

    arm64: Fix the includes for rsi.c
    
    This depended on header pollution only present when FDT is defined. As
    FDT isn't check for in this file we can remove opt_platform.h and
    include the correct set of vm header files.
    
    Reported by:    ivy
    Fixes:  76a2904c352b ("arm64: Add RSI detection for CCA")
    Sponsored by:   Arm Ltd
---
 sys/arm64/arm64/rsi.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sys/arm64/arm64/rsi.c b/sys/arm64/arm64/rsi.c
index 85c7896e13ce..f5af8c977529 100644
--- a/sys/arm64/arm64/rsi.c
+++ b/sys/arm64/arm64/rsi.c
@@ -25,14 +25,13 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_platform.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/physmem.h>
 #include <sys/rwlock.h>
 
-#include <vm/vm_page.h>
+#include <vm/vm.h>
+#include <vm/pmap.h>
 
 #include <machine/rsi.h>
 #include <machine/vmparam.h>