Merge branch 'x86/fixmap' into x86/devel

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / paravirt.c

diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
index f1ab0f727007e5f93f6e4502f7a2e6ef73bec62b..e9b5045372129b15a9edbda594b0296c84843db1 100644 (file)
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
@@ -420,6 +420,8 @@ struct pv_mmu_ops pv_mmu_ops = {
                .enter = paravirt_nop,
                .leave = paravirt_nop,
        },
+
+       .set_fixmap = native_set_fixmap,
 };
 
 EXPORT_SYMBOL_GPL(pv_time_ops);