Index: kernel/arch/amd64/src/boot/multiboot.S
===================================================================
--- kernel/arch/amd64/src/boot/multiboot.S	(revision b2fa1204c76e1eaec329888181d281aac04ed61e)
+++ kernel/arch/amd64/src/boot/multiboot.S	(revision 9787a93b5bdb5688a7ea5fdacbcb990dd34f634a)
@@ -428,17 +428,12 @@
 	
 	/* Call arch_pre_main(multiboot_eax, multiboot_ebx) */
-	xorq %rdi, %rdi
 	movl multiboot_eax, %edi
-	xorq %rsi, %rsi
 	movl multiboot_ebx, %esi
-	
-	movabsq $arch_pre_main, %rax
-	callq *%rax
-	
+	callq arch_pre_main
+
 	long_status $status_main
 	
 	/* Call main_bsp() */
-	movabsq $main_bsp, %rax
-	call *%rax
+	callq main_bsp 
 	
 	/* Not reached */
@@ -638,5 +633,9 @@
 	.quad ptl_2_6g + (PTL_WRITABLE | PTL_PRESENT)
 	.quad ptl_2_7g + (PTL_WRITABLE | PTL_PRESENT)
-	.fill 504, 8, 0
+	.fill 502, 8, 0
+	/* Mapping of [0; 2G) at -2G */
+	.quad ptl_2_0g + (PTL_WRITABLE | PTL_PRESENT)
+	.quad ptl_2_1g + (PTL_WRITABLE | PTL_PRESENT)
+
 
 .align 4096
@@ -644,7 +643,6 @@
 ptl_0:
 	.quad ptl_1 + (PTL_WRITABLE | PTL_PRESENT)
-	.fill 255, 8, 0
+	.fill 510, 8, 0
 	.quad ptl_1 + (PTL_WRITABLE | PTL_PRESENT)
-	.fill 255, 8, 0
 
 .section K_DATA_START, "aw", @progbits
Index: kernel/arch/amd64/src/boot/multiboot2.S
===================================================================
--- kernel/arch/amd64/src/boot/multiboot2.S	(revision b2fa1204c76e1eaec329888181d281aac04ed61e)
+++ kernel/arch/amd64/src/boot/multiboot2.S	(revision 9787a93b5bdb5688a7ea5fdacbcb990dd34f634a)
@@ -244,15 +244,10 @@
 	
 	/* Call arch_pre_main(multiboot_eax, multiboot_ebx) */
-	xorq %rdi, %rdi
 	movl multiboot_eax, %edi
-	xorq %rsi, %rsi
 	movl multiboot_ebx, %esi
-	
-	movabsq $arch_pre_main, %rax
-	callq *%rax
+	callq arch_pre_main 
 	
 	/* Call main_bsp() */
-	movabsq $main_bsp, %rax
-	call *%rax
+	callq main_bsp 
 	
 	/* Not reached */
Index: kernel/arch/amd64/src/mm/km.c
===================================================================
--- kernel/arch/amd64/src/mm/km.c	(revision b2fa1204c76e1eaec329888181d281aac04ed61e)
+++ kernel/arch/amd64/src/mm/km.c	(revision 9787a93b5bdb5688a7ea5fdacbcb990dd34f634a)
@@ -40,5 +40,5 @@
 {
 	config.identity_base = KM_AMD64_IDENTITY_START;
-	config.identity_size = KM_AMD64_IDENTITY_SIZE;	
+	config.identity_size = KM_AMD64_IDENTITY_SIZE;
 }