From 6513c2845f8912c30749cf64704d3dfeeeb9a47a Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 24 Feb 2026 21:20:59 -0500
Subject: [PATCH] sys: Declare 'end' as an extern char[]

While here, remove an unused declaration.

Reviewed by:	jrtc27
Sponsored by:	AFRL, DARPA
Differential Revision:	https://reviews.freebsd.org/D53898
---
 sys/arm/arm/machdep.c          | 2 --
 sys/arm/arm/machdep_boot.c     | 2 +-
 sys/arm64/arm64/machdep_boot.c | 2 +-
 sys/riscv/riscv/machdep.c      | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c
index 60d63cebca3..1cd016f62e1 100644
--- a/sys/arm/arm/machdep.c
+++ b/sys/arm/arm/machdep.c
@@ -120,8 +120,6 @@ vm_offset_t vector_page;
 /* The address at which the kernel was loaded.  Set early in initarm(). */
 vm_paddr_t arm_physmem_kernaddr;
 
-extern int *end;
-
 #ifdef FDT
 vm_paddr_t pmap_pa;
 vm_offset_t systempage;
diff --git a/sys/arm/arm/machdep_boot.c b/sys/arm/arm/machdep_boot.c
index 9bb1f0ccae9..6ad3f9d744b 100644
--- a/sys/arm/arm/machdep_boot.c
+++ b/sys/arm/arm/machdep_boot.c
@@ -69,7 +69,7 @@
 static char static_kenv[4096];
 #endif
 
-extern int *end;
+extern char end[];
 
 static uint32_t board_revision;
 /* hex representation of uint64_t */
diff --git a/sys/arm64/arm64/machdep_boot.c b/sys/arm64/arm64/machdep_boot.c
index 0ccfd1b67a3..742622879f5 100644
--- a/sys/arm64/arm64/machdep_boot.c
+++ b/sys/arm64/arm64/machdep_boot.c
@@ -53,7 +53,7 @@
 #include <ddb/ddb.h>
 #endif
 
-extern int *end;
+extern char end[];
 static char *loader_envp;
 
 #ifdef FDT
diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c
index 0214426eea1..3f454bdb1c8 100644
--- a/sys/riscv/riscv/machdep.c
+++ b/sys/riscv/riscv/machdep.c
@@ -118,7 +118,7 @@ uint32_t boot_hart = BOOT_HART_INVALID;	/* The hart we booted on. */
 
 cpuset_t all_harts;
 
-extern int *end;
+extern char end[];
 
 static char static_kenv[PAGE_SIZE];