Index: kernel/arch/xen32/_link.ld.in
===================================================================
--- kernel/arch/xen32/_link.ld.in	(revision 380954d90c201dd4b8b68b85e7a23ca34f8581a6)
+++ kernel/arch/xen32/_link.ld.in	(revision 5d3d7c2b024a581b55bf33d1145b5c8a62def365)
@@ -1,10 +1,3 @@
 /** Xen32 linker script
- *  
- * umapped section:
- * 	kernel text
- * 	kernel data
- * mapped section:
- *	kernel text
- *	kernel data 
  */
 
@@ -14,15 +7,9 @@
 
 SECTIONS {
-	.unmapped BOOT_OFFSET: AT (0) {
-		unmapped_ktext_start = .;
-		*(K_TEXT_START);
-		unmapped_ktext_end = .;
-	
-		unmapped_kdata_start = .;
-		*(K_DATA_START);
-		unmapped_kdata_end = .;
+	__xen_guest : {
+		*(__xen_guest);
 	}
 	
-	.mapped (PA2KA(BOOT_OFFSET)+SIZEOF(.unmapped)): AT (SIZEOF(.unmapped)) { 
+	.image PA2KA(0): { 
 		ktext_start = .;
 		*(.text);
@@ -34,21 +21,13 @@
 		*(COMMON);			/* global variables */
 		hardcoded_load_address = .;
-		LONG(PA2KA(BOOT_OFFSET));
+		LONG(PA2KA(0));
 		hardcoded_ktext_size = .;
-		LONG((ktext_end - ktext_start) + (unmapped_ktext_end - unmapped_ktext_start));
+		LONG(ktext_end - ktext_start);
 		hardcoded_kdata_size = .;
-		LONG((kdata_end - kdata_start) + (unmapped_kdata_end - unmapped_kdata_start));
-		hardcoded_unmapped_ktext_size = .;
-		LONG(unmapped_ktext_end - unmapped_ktext_start);
-		hardcoded_unmapped_kdata_size = .;
-		LONG(unmapped_kdata_end - unmapped_kdata_start);
+		LONG(kdata_end - kdata_start);
 		symbol_table = .;
 		*(symtab.*);            	/* Symbol table, must be LAST symbol! */
 		*(.bss);			/* uninitialized static variables */
 		kdata_end = .;
-	}
-	
-	__xen_guest(0): AT (SIZEOF(.unmapped)+SIZEOF(.mapped)) {
-		*(__xen_guest);
 	}
 
@@ -57,13 +36,3 @@
 		*(.comment);
 	}
-	
-#ifdef CONFIG_SMP	
-	
-	_hardcoded_unmapped_size = (unmapped_ktext_end - unmapped_ktext_start) + (unmapped_kdata_end - unmapped_kdata_start);
-	ap_boot = unmapped_ap_boot - BOOT_OFFSET + AP_BOOT_OFFSET;
-	ap_gdtr = unmapped_ap_gdtr - BOOT_OFFSET + AP_BOOT_OFFSET;
-	protected_ap_gdtr = PA2KA(ap_gdtr);
-
-#endif /* CONFIG_SMP */
-
 }
Index: kernel/arch/xen32/include/boot
===================================================================
--- kernel/arch/xen32/include/boot	(revision 380954d90c201dd4b8b68b85e7a23ca34f8581a6)
+++ 	(revision )
@@ -1,1 +1,0 @@
-../../ia32/include/boot
Index: kernel/arch/xen32/src/boot/boot.S
===================================================================
--- kernel/arch/xen32/src/boot/boot.S	(revision 380954d90c201dd4b8b68b85e7a23ca34f8581a6)
+++ kernel/arch/xen32/src/boot/boot.S	(revision 5d3d7c2b024a581b55bf33d1145b5c8a62def365)
@@ -29,5 +29,4 @@
 
 #include <arch/boot/boot.h>
-#include <arch/boot/memmap.h>
 #include <arch/mm/page.h>
 #include <arch/pm.h>
@@ -164,48 +163,4 @@
 		mods_end:
 		
-		bt $6, %eax								# mbi->flags[6] (mmap_length, mmap_addr valid)	
-		jc mmap_valid
-			
-			xorl %edx, %edx
-			jmp mmap_invalid
-			
-		mmap_valid:
-		movl 44(%ebx), %ecx						# mbi->mmap_length
-		movl 48(%ebx), %esi						# mbi->mmap_addr
-		movl $e820table, %edi
-		xorl %edx, %edx
-		
-		mmap_loop:
-			cmpl $0, %ecx
-			jle mmap_end
-			
-			movl 4(%esi), %eax					# mmap->base_addr_low
-			movl %eax, (%edi)
-			
-			movl 8(%esi), %eax					# mmap->base_addr_high
-			movl %eax, 4(%edi)
-			
-			movl 12(%esi), %eax					# mmap->length_low
-			movl %eax, 8(%edi)
-			
-			movl 16(%esi), %eax					# mmap->length_high
-			movl %eax, 12(%edi)
-			
-			movl 20(%esi), %eax					# mmap->type
-			movl %eax, 16(%edi)
-			
-			movl (%esi), %eax					# mmap->size
-			addl $0x4, %eax
-			addl %eax, %esi
-			subl %eax, %ecx
-			addl $MEMMAP_E820_RECORD_SIZE, %edi
-			incl %edx
-			jmp mmap_loop
-		
-		mmap_end:
-		
-		mmap_invalid:
-		movl %edx, e820counter
-		
 	invalid_boot:
 	
Index: kernel/arch/xen32/src/smp
===================================================================
--- kernel/arch/xen32/src/smp	(revision 380954d90c201dd4b8b68b85e7a23ca34f8581a6)
+++ 	(revision )
@@ -1,1 +1,0 @@
-../../ia32/src/smp