From 09679780899304ed2d35664359595a0ab9784aa6 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Tue, 8 Jul 2008 15:06:51 -0700 Subject: [PATCH] --- yaml --- r: 104423 b: refs/heads/master c: 22911b3f1cf5431058e56b1727e8ef77be5e0ac9 h: refs/heads/master i: 104421: 8c3d8306bf8cda3c6a81b5ad888a2e0c47be7ff5 104419: 95070de217947f14ddebc5acba5ed3af2747b412 104415: 2793a4144d670044b84eab1450e64bab59ae52cb v: v3 --- [refs] | 2 +- trunk/arch/x86/xen/enlighten.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3b5eb676e410..fbd0c467d42d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 084a2a4e7656209ea93aac9778defa03213ca31d +refs/heads/master: 22911b3f1cf5431058e56b1727e8ef77be5e0ac9 diff --git a/trunk/arch/x86/xen/enlighten.c b/trunk/arch/x86/xen/enlighten.c index a991ee7ade9e..392450787aa9 100644 --- a/trunk/arch/x86/xen/enlighten.c +++ b/trunk/arch/x86/xen/enlighten.c @@ -1194,7 +1194,11 @@ static const struct pv_mmu_ops xen_mmu_ops __initdata = { .kmap_atomic_pte = xen_kmap_atomic_pte, #endif +#ifdef CONFIG_X86_64 + .set_pte = xen_set_pte, +#else .set_pte = xen_set_pte_init, +#endif .set_pte_at = xen_set_pte_at, .set_pmd = xen_set_pmd_hyper,