[Xen-changelog] [xen master] xen/arm: ensure the xenheap is 32MB aligned

[patchbot@xxxxxxx]

commit 4cfdb1210ca4028303dd75b6d141685990096adc
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Thu Sep 26 12:35:34 2013 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu Sep 26 16:21:20 2013 +0100

    xen/arm: ensure the xenheap is 32MB aligned
    
    My patch 08693f5948d8 "xen: arm: reduce the size of the xen heap to max 1/8
    RAM size" unintentionally violated the constraint that the xenheap must be
    32MB aligned, since we only explicitly align the end of the heap and
    xenheap_pages was not a multiple of 32 pages.
    
    Round xenheap pages up to a 32MB boundary.
    
    Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Acked-by: Tim Deegan <tim@xxxxxxx>
---
 xen/arch/arm/setup.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index 1d0b5e9..24bbc73 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -324,7 +324,8 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t 
dtb_size)
      * constraints.
      */
     heap_pages = (ram_size >> PAGE_SHIFT);
-    xenheap_pages = max(heap_pages/8, 128UL<<(20-PAGE_SHIFT));
+    xenheap_pages = (heap_pages/8 + 0x1fffUL) & ~0x1fffUL;
+    xenheap_pages = max(xenheap_pages, 128UL<<(20-PAGE_SHIFT));
 
     do
     {
--
generated by git-patchbot for /home/xen/git/xen.git#master

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