Index: arch/ia32/src/boot/memmap.S
===================================================================
--- arch/ia32/src/boot/memmap.S	(revision 5dce48b968966f5377b2e8198cca8b66216db1bc)
+++ arch/ia32/src/boot/memmap.S	(revision 4bb86b477c254c516ed36be4eb22f8e2918f4f0d)
@@ -35,6 +35,4 @@
 
 .global memmap_arch_init
-.global e820counter
-.global e820table
 .global e801memorysize
 
@@ -48,6 +46,6 @@
 	movw	%bx,%ds
 	movw	%bx,%es
-	movw	$e820table,%di
-	movb	$E820_MAX_RECORDS,e820counter
+	movw	$e820table_boot,%di
+	movb	$E820_MAX_RECORDS,e820counter_boot
 e820loop:	
 	movl	$E820_SMAP,%edx 	# control sequence "SMAP"
@@ -68,5 +66,5 @@
 	movw	%ax,%di
 		
-	decb	e820counter # buffer is full
+	decb	e820counter_boot # buffer is full
 	jz	e820end
 	
@@ -76,11 +74,11 @@
 e820end:
 	movb	$E820_MAX_RECORDS,%al
-	subb	e820counter,%al
-	movb	%al,e820counter # store # of valid entries in e820counter
+	subb	e820counter_boot,%al
+	movb	%al,e820counter_boot # store # of valid entries in e820counter
 
 	jmp	e801begin
 
 e820err:
-	movb	$0,e820counter
+	movb	$0,e820counter_boot
 
 # method e801 - get size of memory
@@ -118,8 +116,3 @@
 e801memorysize:
 	.long	0
-
-e820counter:
-	.byte 0xff
-
-e820table:
-	.space  (32*E820_RECORD_SIZE),0xff # space for 32 records, each E820_RECORD_SIZE bytes long
+