From 4bb8f3358e0996e9208fe456be244410c408e6fa Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 26 Sep 2013 12:35:40 +0100 Subject: xen/arm: rename boot misc region to boot reloc now it has a single purpose Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Tim Deegan --- xen/arch/arm/mm.c | 4 ++-- xen/include/asm-arm/config.h | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'xen') diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 5cb6dac3a5..89d9f57d11 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 efeb9525df..9e395c2e65 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 @@ -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 -- cgit v1.2.3