Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75b8bb3e authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar
Browse files

x86: change write_ldt_entry signature 



this patch changes the signature of write_ldt_entry.

Signed-off-by: default avatarGlauber de Oliveira Costa <gcosta@redhat.com>
CC: Zachary Amsden <zach@vmware.com>
CC: Jeremy Fitzhardinge <Jeremy.Fitzhardinge.citrix.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 014b15be

arch/x86/kernel/ldt.c

+1 −2
Original line number Diff line number Diff line
@@ -229,8 +229,7 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode) 


	/* Install the new entry ...  */

install:

	write_ldt_entry(mm->context.ldt, ldt_info.entry_number,

			ldt.a, ldt.b);

	write_ldt_entry(mm->context.ldt, ldt_info.entry_number, &ldt);

	error = 0;



out_unlock:

arch/x86/kernel/paravirt_32.c

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ struct pv_cpu_ops pv_cpu_ops = { 
	.store_idt = native_store_idt,

	.store_tr = native_store_tr,

	.load_tls = native_load_tls,

	.write_ldt_entry = write_dt_entry,

	.write_ldt_entry = native_write_ldt_entry,

	.write_gdt_entry = native_write_gdt_entry,

	.write_idt_entry = native_write_idt_entry,

	.load_sp0 = native_load_sp0,

arch/x86/kernel/vmi_32.c

+10 −1
Original line number Diff line number Diff line
@@ -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,

arch/x86/xen/enlighten.c

+2 −2
Original line number Diff line number Diff line
@@ -357,11 +357,11 @@ static void xen_load_tls(struct thread_struct *t, unsigned int cpu) 
}



static void xen_write_ldt_entry(struct desc_struct *dt, int entrynum,

				u32 low, u32 high)

				const void *ptr)

{

	unsigned long lp = (unsigned long)&dt[entrynum];

	xmaddr_t mach_lp = virt_to_machine(lp);

	u64 entry = (u64)high << 32 | low;

	u64 entry = *(u64 *)ptr;



	preempt_disable();

include/asm-x86/desc_32.h

+8 −1
Original line number Diff line number Diff line
@@ -69,12 +69,19 @@ static inline void pack_gate(gate_desc *gate, 
#define load_TLS(t, cpu) native_load_tls(t, cpu)

#define set_ldt native_set_ldt



#define write_ldt_entry(dt, entry, a, b) write_dt_entry(dt, entry, a, b)

#define write_ldt_entry(dt, entry, desc) \

				native_write_ldt_entry(dt, entry, desc)

#define write_gdt_entry(dt, entry, desc, type) \

				native_write_gdt_entry(dt, entry, desc, type)

#define write_idt_entry(dt, entry, g) native_write_idt_entry(dt, entry, g)

#endif



static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry,

					  const void *desc)

{

	memcpy(&ldt[entry], desc, sizeof(struct desc_struct));

}



static inline void native_write_idt_entry(gate_desc *idt, int entry,

					  const gate_desc *gate)

{