Commit 2e2ec952 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen

* 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
  xen: set up mmu_ops before trying to set any ptes
parents 8d5eb435 973df35e
...@@ -1075,6 +1075,8 @@ asmlinkage void __init xen_start_kernel(void) ...@@ -1075,6 +1075,8 @@ asmlinkage void __init xen_start_kernel(void)
* Set up some pagetable state before starting to set any ptes. * Set up some pagetable state before starting to set any ptes.
*/ */
xen_init_mmu_ops();
/* Prevent unwanted bits from being set in PTEs. */ /* Prevent unwanted bits from being set in PTEs. */
__supported_pte_mask &= ~_PAGE_GLOBAL; __supported_pte_mask &= ~_PAGE_GLOBAL;
if (!xen_initial_domain()) if (!xen_initial_domain())
...@@ -1099,7 +1101,6 @@ asmlinkage void __init xen_start_kernel(void) ...@@ -1099,7 +1101,6 @@ asmlinkage void __init xen_start_kernel(void)
*/ */
xen_setup_stackprotector(); xen_setup_stackprotector();
xen_init_mmu_ops();
xen_init_irq_ops(); xen_init_irq_ops();
xen_init_cpuid_mask(); xen_init_cpuid_mask();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment