[Xen-changelog] [xen master] xen/arm: Load dtb after dom0 kernel

[patchbot@xxxxxxx]

commit 55eb2e2cb844a798b818fda7aac228885a064784
Author:     Julien Grall <julien.grall@xxxxxxxxxx>
AuthorDate: Fri May 10 03:17:52 2013 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Fri May 10 14:17:15 2013 +0100

    xen/arm: Load dtb after dom0 kernel
    
    On some setup, the first linux page table is at 0x40004000. Xen will load
    dom0 device tree at 0x4000100. In case of the device tree is big, linux will
    corrupt the device tree.
    
    Signed-off-by: Julien Grall <julien.grall@xxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 xen/arch/arm/domain_build.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 8748272..6581492 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -407,8 +407,9 @@ int construct_dom0(struct domain *d)
     /* The following loads use the domain's p2m */
     p2m_load_VTTBR(d);
 
-    dtb_load(&kinfo);
+    kinfo.dtb_paddr = kinfo.zimage.load_addr + kinfo.zimage.len;
     kernel_load(&kinfo);
+    dtb_load(&kinfo);
 
     discard_initial_modules();
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog