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

Commit 8229d754 authored by Jaswinder Singh Rajput's avatar Jaswinder Singh Rajput Committed by Ingo Molnar
Browse files

x86: cpu architecture debug code, build fix, cleanup 



move store_ldt outside the CONFIG_PARAVIRT section and
also clean up the code a bit.

Signed-off-by: default avatarJaswinder Singh Rajput <jaswinder@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 9b779edf

arch/x86/include/asm/desc.h

+2 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ static inline int desc_empty(const void *ptr) 
#define store_gdt(dtr) native_store_gdt(dtr)

#define store_idt(dtr) native_store_idt(dtr)

#define store_tr(tr) (tr = native_store_tr())

#define store_ldt(ldt) asm("sldt %0":"=m" (ldt))



#define load_TLS(t, cpu) native_load_tls(t, cpu)

#define set_ldt native_set_ldt
@@ -112,6 +111,8 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries) 
}

#endif	/* CONFIG_PARAVIRT */



#define store_ldt(ldt) asm("sldt %0" : "=m"(ldt))



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

					  const gate_desc *gate)

{

arch/x86/kernel/cpu/cpu_debug.c

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/smp.h>



#include <asm/cpu_debug.h>

#include <asm/paravirt.h>

#include <asm/system.h>

#include <asm/traps.h>

#include <asm/apic.h>
@@ -427,7 +428,7 @@ static void print_tss(void *arg) 
	seq_printf(seq, " CS\t:             %04x\n", seg);

	asm("movl %%ds,%0" : "=r" (seg));

	seq_printf(seq, " DS\t:             %04x\n", seg);

	seq_printf(seq, " SS\t:             %04lx\n", regs->ss);

	seq_printf(seq, " SS\t:             %04lx\n", regs->ss & 0xffff);

	asm("movl %%es,%0" : "=r" (seg));

	seq_printf(seq, " ES\t:             %04x\n", seg);

	asm("movl %%fs,%0" : "=r" (seg));