From 6f0fd9ca974dcf628da7ec461b9048e939b4038a Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Fri, 22 Mar 2013 10:34:28 -0400
Subject: [PATCH] --- yaml --- r: 361871 b: refs/heads/master c:
 d3eb2c89e7ba996e8781b22a6e7d0a895ef55630 h: refs/heads/master i:   361869:
 c682a194e6aee51b15592cf8b27b6802f5cb0859   361867:
 b77230b4458b57964ea0720669205a8cad1f8d26   361863:
 ba3b495d9931dc3e1bf2d31bc587b2dc8ab8223e   361855:
 e1ed6508e1ed1cf765c4fe9a46fad5284d0d8b31 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/xen/mmu.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9a574a09af2e..8049455706df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76fc253723add627cf28c09c79fb67e71f9e4782
+refs/heads/master: d3eb2c89e7ba996e8781b22a6e7d0a895ef55630
diff --git a/trunk/arch/x86/xen/mmu.c b/trunk/arch/x86/xen/mmu.c
index e8e34938c57d..6afbb2ca9a0a 100644
--- a/trunk/arch/x86/xen/mmu.c
+++ b/trunk/arch/x86/xen/mmu.c
@@ -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
 
@@ -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();