HACK: try to keep ramoops intact

Conflicts:
	xen/arch/arm/platforms/exynos5.c

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index b92c64bcd071acef3682c18906a799289ed2132f..951a0bd4cf12e59254321c872f7a0bf8adec2551 100644 (file)
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -566,7 +566,7 @@ int construct_dom0(struct domain *d)
     kernel_load(&kinfo);
     dtb_load(&kinfo);
 
-    discard_initial_modules();
+    /* discard_initial_modules(); */
 
     v->is_initialised = 1;
     clear_bit(_VPF_down, &v->pause_flags);

diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index da2a734b586afb8969ad574478d9ddba889889f8..2f72dc848293ac591bf54802704136e385c1f336 100644 (file)
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -48,7 +48,7 @@ struct cpuinfo_arm __read_mostly boot_cpu_data;
 
 static __used void init_done(void)
 {
-    free_init_memory();
+    /* free_init_memory(); */
     startup_cpu_idle_loop();
 }
 

diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
index 84d704dc3d72e86d375c91280e79b4c71c0d9f33..3564987a12e90d030493eaac11ba1c5935b05e0e 100644 (file)
--- a/xen/common/device_tree.c
+++ b/xen/common/device_tree.c
@@ -400,6 +400,13 @@ static void __init process_memory_node(const void *fdt, int node,
     for ( i = 0; i < banks && early_info.mem.nr_banks < NR_MEM_BANKS; i++ )
     {
         device_tree_get_reg(&cell, address_cells, size_cells, &start, &size);
+        early_printk("mem bank %d: %#"PRIpaddr"-%#"PRIpaddr"\n",i,start,start+size-1);
+#if 1
+        early_printk("  moving by 0x10000000:\n");
+        start += 0x10000000;
+        size -= 0x10000000;
+        early_printk("mem bank %d: %#"PRIpaddr"-%#"PRIpaddr"\n",i,start,start+size-1);
+#endif
         early_info.mem.bank[early_info.mem.nr_banks].start = start;
         early_info.mem.bank[early_info.mem.nr_banks].size = size;
         early_info.mem.nr_banks++;

diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h
index e3cfaf1cf459a40e7463f9ddb8f8f22d1eb407bc..c23a5e3c48b4fd89ee30330ae445c9cbaca3fa3a 100644 (file)
--- a/xen/include/asm-arm/config.h
+++ b/xen/include/asm-arm/config.h
@@ -118,6 +118,7 @@
 #define FIXMAP_GICH     6  /* Interrupt controller: virtual interface control registers */
 
 #define PAGE_SHIFT              12
+#  define CONFIG_PAGEALLOC_MAX_ORDER 0x10
 
 #ifndef __ASSEMBLY__
 #define PAGE_SIZE           (1L << PAGE_SHIFT)