diff options
author | Eduardo Habkost <ehabkost@redhat.com> | 2008-07-08 18:06:23 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-16 04:53:43 -0400 |
commit | a312b37b2a212fd2e227d1d6321f903b91b65ec7 (patch) | |
tree | 4861cb8b2985ef5a05705f001a68cd1c23bf1789 /arch/x86/xen/enlighten.c | |
parent | 45158894d4d6704afbb4cefe55e5f6ca279fe12a (diff) |
x86/paravirt: call paravirt_pagetable_setup_{start, done}
Call paravirt_pagetable_setup_{start,done}
These paravirt_ops functions were not being called on x86_64.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Stephen Tweedie <sct@redhat.com>
Cc: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/xen/enlighten.c')
-rw-r--r-- | arch/x86/xen/enlighten.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index bb508456ef52..eaab6c9b4a84 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
@@ -841,6 +841,7 @@ static __init void xen_set_pte_init(pte_t *ptep, pte_t pte) | |||
841 | 841 | ||
842 | static __init void xen_pagetable_setup_start(pgd_t *base) | 842 | static __init void xen_pagetable_setup_start(pgd_t *base) |
843 | { | 843 | { |
844 | #ifdef CONFIG_X86_32 | ||
844 | pgd_t *xen_pgd = (pgd_t *)xen_start_info->pt_base; | 845 | pgd_t *xen_pgd = (pgd_t *)xen_start_info->pt_base; |
845 | int i; | 846 | int i; |
846 | 847 | ||
@@ -886,6 +887,7 @@ static __init void xen_pagetable_setup_start(pgd_t *base) | |||
886 | /* Unpin initial Xen pagetable */ | 887 | /* Unpin initial Xen pagetable */ |
887 | pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, | 888 | pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, |
888 | PFN_DOWN(__pa(xen_start_info->pt_base))); | 889 | PFN_DOWN(__pa(xen_start_info->pt_base))); |
890 | #endif /* CONFIG_X86_32 */ | ||
889 | } | 891 | } |
890 | 892 | ||
891 | void xen_setup_shared_info(void) | 893 | void xen_setup_shared_info(void) |
@@ -927,9 +929,11 @@ static __init void xen_pagetable_setup_done(pgd_t *base) | |||
927 | 929 | ||
928 | xen_setup_shared_info(); | 930 | xen_setup_shared_info(); |
929 | 931 | ||
932 | #ifdef CONFIG_X86_32 | ||
930 | /* Actually pin the pagetable down, but we can't set PG_pinned | 933 | /* Actually pin the pagetable down, but we can't set PG_pinned |
931 | yet because the page structures don't exist yet. */ | 934 | yet because the page structures don't exist yet. */ |
932 | pin_pagetable_pfn(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(base))); | 935 | pin_pagetable_pfn(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(base))); |
936 | #endif | ||
933 | } | 937 | } |
934 | 938 | ||
935 | static __init void xen_post_allocator_init(void) | 939 | static __init void xen_post_allocator_init(void) |