diff options
Diffstat (limited to 'arch/x86/xen/mmu.c')
-rw-r--r-- | arch/x86/xen/mmu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 4c63b7f452dd..b2371671b11c 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
@@ -195,7 +195,7 @@ DEFINE_PER_CPU(unsigned long, xen_current_cr3); /* actual vcpu cr3 */ | |||
195 | * 512 and 1024 entries respectively. | 195 | * 512 and 1024 entries respectively. |
196 | */ | 196 | */ |
197 | 197 | ||
198 | static unsigned long max_p2m_pfn __read_mostly; | 198 | unsigned long xen_max_p2m_pfn __read_mostly; |
199 | 199 | ||
200 | #define P2M_PER_PAGE (PAGE_SIZE / sizeof(unsigned long)) | 200 | #define P2M_PER_PAGE (PAGE_SIZE / sizeof(unsigned long)) |
201 | #define P2M_MID_PER_PAGE (PAGE_SIZE / sizeof(unsigned long *)) | 201 | #define P2M_MID_PER_PAGE (PAGE_SIZE / sizeof(unsigned long *)) |
@@ -293,7 +293,7 @@ void xen_build_mfn_list_list(void) | |||
293 | p2m_top_mfn_init(p2m_top_mfn); | 293 | p2m_top_mfn_init(p2m_top_mfn); |
294 | } | 294 | } |
295 | 295 | ||
296 | for (pfn = 0; pfn < max_p2m_pfn; pfn += P2M_PER_PAGE) { | 296 | for (pfn = 0; pfn < xen_max_p2m_pfn; pfn += P2M_PER_PAGE) { |
297 | unsigned topidx = p2m_top_index(pfn); | 297 | unsigned topidx = p2m_top_index(pfn); |
298 | unsigned mididx = p2m_mid_index(pfn); | 298 | unsigned mididx = p2m_mid_index(pfn); |
299 | unsigned long **mid; | 299 | unsigned long **mid; |
@@ -335,7 +335,7 @@ void xen_setup_mfn_list_list(void) | |||
335 | 335 | ||
336 | HYPERVISOR_shared_info->arch.pfn_to_mfn_frame_list_list = | 336 | HYPERVISOR_shared_info->arch.pfn_to_mfn_frame_list_list = |
337 | virt_to_mfn(p2m_top_mfn); | 337 | virt_to_mfn(p2m_top_mfn); |
338 | HYPERVISOR_shared_info->arch.max_pfn = max_p2m_pfn; | 338 | HYPERVISOR_shared_info->arch.max_pfn = xen_max_p2m_pfn; |
339 | } | 339 | } |
340 | 340 | ||
341 | /* Set up p2m_top to point to the domain-builder provided p2m pages */ | 341 | /* Set up p2m_top to point to the domain-builder provided p2m pages */ |
@@ -345,7 +345,7 @@ void __init xen_build_dynamic_phys_to_machine(void) | |||
345 | unsigned long max_pfn = min(MAX_DOMAIN_PAGES, xen_start_info->nr_pages); | 345 | unsigned long max_pfn = min(MAX_DOMAIN_PAGES, xen_start_info->nr_pages); |
346 | unsigned pfn; | 346 | unsigned pfn; |
347 | 347 | ||
348 | max_p2m_pfn = max_pfn; | 348 | xen_max_p2m_pfn = max_pfn; |
349 | 349 | ||
350 | p2m_missing = extend_brk(PAGE_SIZE, PAGE_SIZE); | 350 | p2m_missing = extend_brk(PAGE_SIZE, PAGE_SIZE); |
351 | p2m_init(p2m_missing); | 351 | p2m_init(p2m_missing); |