From c5f6a1a47d8f167589d03d26e8e24dde6dfe2eda Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Fri, 27 Feb 2009 15:34:59 -0800 Subject: [PATCH] --- yaml --- r: 143235 b: refs/heads/master c: cdaead6b4e657f960d6d6f9f380e7dfeedc6a09b h: refs/heads/master i: 143233: 2d1485b9a47595da35c5853e01b309e170b1863d 143231: 6f8a5fd88abf5270b3da7c6c91ffe248a0049bdb v: v3 --- [refs] | 2 +- trunk/arch/x86/xen/mmu.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d1f262a8dfc7..5ea338bbfe71 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e791ca0fd79461ad72559a6e01362da4d7d16253 +refs/heads/master: cdaead6b4e657f960d6d6f9f380e7dfeedc6a09b diff --git a/trunk/arch/x86/xen/mmu.c b/trunk/arch/x86/xen/mmu.c index 0b2d554d1d58..6e58acd4d00d 100644 --- a/trunk/arch/x86/xen/mmu.c +++ b/trunk/arch/x86/xen/mmu.c @@ -184,7 +184,7 @@ static inline unsigned p2m_index(unsigned long pfn) } /* Build the parallel p2m_top_mfn structures */ -void xen_setup_mfn_list_list(void) +static void __init xen_build_mfn_list_list(void) { unsigned pfn, idx; @@ -198,7 +198,10 @@ void xen_setup_mfn_list_list(void) unsigned topidx = idx * P2M_ENTRIES_PER_PAGE; p2m_top_mfn_list[idx] = virt_to_mfn(&p2m_top_mfn[topidx]); } +} +void xen_setup_mfn_list_list(void) +{ BUG_ON(HYPERVISOR_shared_info == &xen_dummy_shared_info); HYPERVISOR_shared_info->arch.pfn_to_mfn_frame_list_list = @@ -218,6 +221,8 @@ void __init xen_build_dynamic_phys_to_machine(void) p2m_top[topidx] = &mfn_list[pfn]; } + + xen_build_mfn_list_list(); } unsigned long get_phys_to_machine(unsigned long pfn)