x86: change write_ldt_entry signature

this patch changes the signature of write_ldt_entry.

Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
CC: Zachary Amsden <zach@vmware.com>
CC: Jeremy Fitzhardinge <Jeremy.Fitzhardinge.citrix.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 10 insertions, 1 deletions

diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c
index 21edd0d6eae5..10c46419d35d 100644
--- a/arch/x86/kernel/vmi_32.c
+++ b/arch/x86/kernel/vmi_32.c
@@ -64,6 +64,7 @@ static struct {
         void (*set_tr)(u32 selector);
         void (*write_idt_entry)(struct desc_struct *, int, u32, u32);
         void (*write_gdt_entry)(struct desc_struct *, int, u32, u32);
+        void (*write_ldt_entry)(struct desc_struct *, int, u32, u32);
         void (*set_kernel_stack)(u32 selector, u32 sp0);
         void (*allocate_page)(u32, u32, u32, u32, u32);
         void (*release_page)(u32, u32);
@@ -229,6 +230,13 @@ static void vmi_write_gdt_entry(struct desc_struct *dt, int entry,
         vmi_ops.write_gdt_entry(dt, entry, gdt_entry[0], gdt_entry[2]);
 }
 
+static void vmi_write_ldt_entry(struct desc_struct *dt, int entry,
+                                const void *desc)
+{
+        u32 *ldt_entry = (u32 *)desc;
+        vmi_ops.write_idt_entry(dt, entry, ldt_entry[0], ldt_entry[2]);
+}
+
 static void vmi_load_sp0(struct tss_struct *tss,
                                    struct thread_struct *thread)
 {
@@ -805,7 +813,8 @@ static inline int __init activate_vmi(void)
         para_fill(pv_cpu_ops.store_idt, GetIDT);
         para_fill(pv_cpu_ops.store_tr, GetTR);
         pv_cpu_ops.load_tls = vmi_load_tls;
-        para_fill(pv_cpu_ops.write_ldt_entry, WriteLDTEntry);
+        para_wrap(pv_cpu_ops.write_ldt_entry, vmi_write_ldt_entry,
+                  write_ldt_entry, WriteLDTEntry);
         para_wrap(pv_cpu_ops.write_gdt_entry, vmi_write_gdt_entry,
                   write_gdt_entry, WriteGDTEntry);
         para_wrap(pv_cpu_ops.write_idt_entry, vmi_write_idt_entry,