Index: kernel/arch/amd64/_link.ld.in
===================================================================
--- kernel/arch/amd64/_link.ld.in	(revision 8a1afd26eb90be3d715d4ce522280cbbf475f0a9)
+++ kernel/arch/amd64/_link.ld.in	(revision d59718e246e2f30ad97e0364fac7e75455fcb7d1)
@@ -16,12 +16,9 @@
 
 	.unmapped BOOT_OFFSET: AT (0) {
-		unmapped_ktext_start = .;
+		unmapped_start = .;
 		*(K_TEXT_START);
-		unmapped_ktext_end = .;
-
-		unmapped_kdata_start = .;
 		*(K_DATA_START);
 		*(K_INI_PTLS);
-		unmapped_kdata_end = .;
+		unmapped_end = .;
 	}
 
Index: kernel/arch/amd64/include/arch/boot/boot.h
===================================================================
--- kernel/arch/amd64/include/arch/boot/boot.h	(revision 8a1afd26eb90be3d715d4ce522280cbbf475f0a9)
+++ kernel/arch/amd64/include/arch/boot/boot.h	(revision d59718e246e2f30ad97e0364fac7e75455fcb7d1)
@@ -42,5 +42,5 @@
 #ifndef __ASSEMBLER__
 
-extern uint8_t unmapped_kdata_end[];
+extern uint8_t unmapped_end[];
 
 #endif /* __ASSEMBLER__ */
Index: kernel/arch/amd64/src/amd64.c
===================================================================
--- kernel/arch/amd64/src/amd64.c	(revision 8a1afd26eb90be3d715d4ce522280cbbf475f0a9)
+++ kernel/arch/amd64/src/amd64.c	(revision d59718e246e2f30ad97e0364fac7e75455fcb7d1)
@@ -94,5 +94,5 @@
 
 #ifdef CONFIG_SMP
-	size_t unmapped_size = (uintptr_t) unmapped_kdata_end - BOOT_OFFSET;
+	size_t unmapped_size = (uintptr_t) unmapped_end - BOOT_OFFSET;
 	/* Copy AP bootstrap routines below 1 MB. */
 	memcpy((void *) AP_BOOT_OFFSET, (void *) BOOT_OFFSET, unmapped_size);
Index: kernel/arch/amd64/src/boot/multiboot.S
===================================================================
--- kernel/arch/amd64/src/boot/multiboot.S	(revision 8a1afd26eb90be3d715d4ce522280cbbf475f0a9)
+++ kernel/arch/amd64/src/boot/multiboot.S	(revision d59718e246e2f30ad97e0364fac7e75455fcb7d1)
@@ -70,5 +70,5 @@
 	.long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)  /* checksum */
 	.long multiboot_header
-	.long unmapped_ktext_start
+	.long unmapped_start
 	.long 0
 	.long 0
Index: kernel/arch/amd64/src/boot/multiboot2.S
===================================================================
--- kernel/arch/amd64/src/boot/multiboot2.S	(revision 8a1afd26eb90be3d715d4ce522280cbbf475f0a9)
+++ kernel/arch/amd64/src/boot/multiboot2.S	(revision d59718e246e2f30ad97e0364fac7e75455fcb7d1)
@@ -69,5 +69,5 @@
 		.long tag_address_end - tag_address_start
 		.long multiboot2_header_start
-		.long unmapped_ktext_start
+		.long unmapped_start
 		.long 0
 		.long 0