Skip to content

Commit

Permalink
xen/mmu: Move the setting of pvops.write_cr3 to later phase in bootup.
Browse files Browse the repository at this point in the history
We move the setting of write_cr3 from the early bootup variant
(see git commit 0cc9129
"x86-64, xen, mmu: Provide an early version of write_cr3.")
to a more appropiate location.

This new location sets all of the other non-early variants
of pvops calls - and most importantly is before the
alternative_asm mechanism kicks in.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  • Loading branch information
Konrad Rzeszutek Wilk committed Mar 27, 2013
1 parent 76fc253 commit d3eb2c8
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions arch/x86/xen/mmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1467,8 +1467,6 @@ static void __init xen_write_cr3_init(unsigned long cr3)
__xen_write_cr3(true, cr3);

xen_mc_issue(PARAVIRT_LAZY_CPU); /* interrupts restored */

pv_mmu_ops.write_cr3 = &xen_write_cr3;
}
#endif

Expand Down Expand Up @@ -2122,6 +2120,7 @@ static void __init xen_post_allocator_init(void)
#endif

#ifdef CONFIG_X86_64
pv_mmu_ops.write_cr3 = &xen_write_cr3;
SetPagePinned(virt_to_page(level3_user_vsyscall));
#endif
xen_mark_init_mm_pinned();
Expand Down

0 comments on commit d3eb2c8

Please sign in to comment.