From 0c46d39e2146422a58307f5513c360bedbaeb8b4 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Wed, 30 Jan 2008 13:33:20 +0100 Subject: [PATCH] --- yaml --- r: 80340 b: refs/heads/master c: d8dd8eec57254adac48e46c6d191cb24161d8b4d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/paravirt.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index de40b2f27c5d..a620efef2314 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9042219cd8d43b81322b826d463dd6e52acae6cf +refs/heads/master: d8dd8eec57254adac48e46c6d191cb24161d8b4d diff --git a/trunk/arch/x86/kernel/paravirt.c b/trunk/arch/x86/kernel/paravirt.c index c67d33103b91..37f38b71c50a 100644 --- a/trunk/arch/x86/kernel/paravirt.c +++ b/trunk/arch/x86/kernel/paravirt.c @@ -367,8 +367,10 @@ struct pv_apic_ops pv_apic_ops = { }; struct pv_mmu_ops pv_mmu_ops = { +#ifndef CONFIG_X86_64 .pagetable_setup_start = native_pagetable_setup_start, .pagetable_setup_done = native_pagetable_setup_done, +#endif .read_cr2 = native_read_cr2, .write_cr2 = native_write_cr2,