Index: kernel/arch/amd64/include/arch/mm/km.h
===================================================================
--- kernel/arch/amd64/include/arch/mm/km.h	(revision f72906c1ceb4b546d431ab8e9c41434425c1096f)
+++ kernel/arch/amd64/include/arch/mm/km.h	(revision f1a8c2379906b64332f30f0aabf7f074666d74a7)
@@ -38,9 +38,9 @@
 #include <typedefs.h>
 
-#define KM_AMD64_IDENTITY_START		UINT64_C(0xffff800000000000)
-#define KM_AMD64_IDENTITY_SIZE		UINT64_C(0x0000400000000000)
+#define KM_AMD64_IDENTITY_START		UINT64_C(0xffffffff80000000)
+#define KM_AMD64_IDENTITY_SIZE		UINT64_C(0x0000000080000000)
 
-#define KM_AMD64_NON_IDENTITY_START	UINT64_C(0xffffc00000000000)
-#define KM_AMD64_NON_IDENTITY_SIZE	UINT64_C(0x0000400000000000)
+#define KM_AMD64_NON_IDENTITY_START	UINT64_C(0xffff800000000000)
+#define KM_AMD64_NON_IDENTITY_SIZE	UINT64_C(0x00007fff80000000)
 
 extern void km_identity_arch_init(void);
Index: kernel/arch/amd64/include/arch/mm/page.h
===================================================================
--- kernel/arch/amd64/include/arch/mm/page.h	(revision f72906c1ceb4b546d431ab8e9c41434425c1096f)
+++ kernel/arch/amd64/include/arch/mm/page.h	(revision f1a8c2379906b64332f30f0aabf7f074666d74a7)
@@ -44,11 +44,11 @@
 #ifndef __ASM__
 
-#define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffff800000000000))
-#define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffff800000000000))
+#define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffffffff80000000))
+#define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffffffff80000000))
 
 #else /* __ASM__ */
 
-#define KA2PA(x)  ((x) - 0xffff800000000000)
-#define PA2KA(x)  ((x) + 0xffff800000000000)
+#define KA2PA(x)  ((x) - 0xffffffff80000000)
+#define PA2KA(x)  ((x) + 0xffffffff80000000)
 
 #endif /* __ASM__ */