Index: arch/amd64/src/asm_utils.S
===================================================================
--- arch/amd64/src/asm_utils.S	(revision 085d973c11067c76c6bb3481033b2ba387555f4a)
+++ arch/amd64/src/asm_utils.S	(revision 42744880a09efbd22a7e49822241bb65a91cd197)
@@ -219,3 +219,3 @@
 .global interrupt_handler_size
 
-interrupt_handler_size: .long (h_end-h_start)/IDT_ITEMS
+interrupt_handler_size: .quad (h_end-h_start)/IDT_ITEMS
Index: arch/amd64/src/boot/boot.S
===================================================================
--- arch/amd64/src/boot/boot.S	(revision 085d973c11067c76c6bb3481033b2ba387555f4a)
+++ arch/amd64/src/boot/boot.S	(revision 42744880a09efbd22a7e49822241bb65a91cd197)
@@ -165,4 +165,5 @@
 		
 		xorq %rdx, %rdx
+		movq %rdx, %rcx
 		movl 24(%ebx), %esi						# mbi->mods_addr
 		movl 0(%esi), %edx						# mods->mod_start
@@ -172,5 +173,5 @@
 		
 		mods_invalid:
-		movl %ecx, init_size
+		movq %rcx, init_size
 		movq %rdx, init_addr