[prev in list] [next in list] [prev in thread] [next in thread]
List: xen-cvs
Subject: [Xen-changelog] [xen master] xen/arm: rename boot misc region to boot reloc now it has a single purp
From: patchbot () xen ! org
Date: 2013-09-27 15:50:59
Message-ID: E1VPaJn-0005Ff-4D () xenbits ! xen ! org
[Download RAW message or body]
commit 4bb8f3358e0996e9208fe456be244410c408e6fa
Author: Ian Campbell <ian.campbell@citrix.com>
AuthorDate: Thu Sep 26 12:35:40 2013 +0100
Commit: Ian Campbell <ian.campbell@citrix.com>
CommitDate: Thu Sep 26 16:21:47 2013 +0100
xen/arm: rename boot misc region to boot reloc now it has a single purpose
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Julien Grall <julien.grall@linaro.org>
Acked-by: Tim Deegan <tim@xen.org>
---
xen/arch/arm/mm.c | 4 ++--
xen/include/asm-arm/config.h | 7 ++-----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c
index 5cb6dac..89d9f57 100644
--- a/xen/arch/arm/mm.c
+++ b/xen/arch/arm/mm.c
@@ -128,7 +128,7 @@ static inline void check_memory_layout_alignment_constraints(void) {
/* 2MB aligned regions */
BUILD_BUG_ON(XEN_VIRT_START & ~SECOND_MASK);
BUILD_BUG_ON(FIXMAP_ADDR(0) & ~SECOND_MASK);
- BUILD_BUG_ON(BOOT_MISC_VIRT_START & ~SECOND_MASK);
+ BUILD_BUG_ON(BOOT_RELOC_VIRT_START & ~SECOND_MASK);
/* 1GB aligned regions */
BUILD_BUG_ON(XENHEAP_VIRT_START & ~FIRST_MASK);
#ifdef CONFIG_DOMAIN_PAGE
@@ -377,7 +377,7 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr)
int i;
/* Map the destination in the boot misc area. */
- dest_va = BOOT_MISC_VIRT_START;
+ dest_va = BOOT_RELOC_VIRT_START;
pte = mfn_to_xen_entry(xen_paddr >> PAGE_SHIFT);
write_pte(xen_second + second_table_offset(dest_va), pte);
flush_xen_data_tlb_range_va(dest_va, SECOND_SIZE);
diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h
index efeb952..9e395c2 100644
--- a/xen/include/asm-arm/config.h
+++ b/xen/include/asm-arm/config.h
@@ -81,10 +81,7 @@
* 2M - 4M Xen text, data, bss
* 4M - 6M Fixmap: special-purpose 4K mapping slots
* 6M - 8M Early boot mapping of FDT
- * 8M - 10M Early boot misc (see below)
- *
- * The early boot misc area is used:
- * - in setup_pagetables() when relocating Xen.
+ * 8M - 10M Early relocation address (used when relocating Xen)
*
* ARM32 layout:
* 0 - 8M <COMMON>
@@ -117,7 +114,7 @@
#define XEN_VIRT_START _AT(vaddr_t,0x00200000)
#define FIXMAP_ADDR(n) (_AT(vaddr_t,0x00400000) + (n) * PAGE_SIZE)
#define BOOT_FDT_VIRT_START _AT(vaddr_t,0x00600000)
-#define BOOT_MISC_VIRT_START _AT(vaddr_t,0x00800000)
+#define BOOT_RELOC_VIRT_START _AT(vaddr_t,0x00800000)
#define HYPERVISOR_VIRT_START XEN_VIRT_START
--
generated by git-patchbot for /home/xen/git/xen.git#master
_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xen.org
http://lists.xensource.com/xen-changelog
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic