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

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

x86: unify set_tss_desc 



This patch unifies the set_tss_desc between i386 and x86_64,
which can now have a common implementation. After the old
functions are removed from desc_{32,64}.h, nothing important is
left, and the files can be removed.

Signed-off-by: default avatarGlauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 507f90c9

include/asm-x86/desc.h

+33 −6
Original line number Diff line number Diff line
@@ -165,6 +165,39 @@ static inline void pack_ldt(ldt_desc *ldt, unsigned long addr, 
#endif

}



static inline void pack_tss(tss_desc *tss, unsigned long addr,

			   unsigned size, unsigned entry)

{

#ifdef CONFIG_X86_64

		set_tssldt_descriptor(tss,

			     addr, entry, size);

#else

		pack_descriptor(tss, (unsigned long)addr,

				size,

				0x80 | entry, 0);

#endif

}



static inline void __set_tss_desc(unsigned cpu, unsigned int entry, void *addr)

{

	struct desc_struct *d = get_cpu_gdt_table(cpu);

	tss_desc tss;



	/*

	 * sizeof(unsigned long) coming from an extra "long" at the end

	 * of the iobitmap. See tss_struct definition in processor.h

	 *

	 * -1? seg base+limit should be pointing to the address of the

	 * last valid byte

	 */

	pack_tss(&tss, (unsigned long)addr,

		IO_BITMAP_OFFSET + IO_BITMAP_BYTES + sizeof(unsigned long) - 1,

		DESC_TSS);

	write_gdt_entry(d, entry, &tss, DESC_TSS);

}



#define set_tss_desc(cpu, addr) __set_tss_desc(cpu, GDT_ENTRY_TSS, addr)



static inline void native_set_ldt(const void *addr, unsigned int entries)

{

	if (likely(entries == 0))
@@ -222,12 +255,6 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu) 
		gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];

}



#ifdef CONFIG_X86_32

# include "desc_32.h"

#else

# include "desc_64.h"

#endif



#define _LDT_empty(info) (\

	(info)->base_addr	== 0	&& \

	(info)->limit		== 0	&& \

include/asm-x86/desc_32.h

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
#ifndef __ARCH_DESC_H

#define __ARCH_DESC_H



#include <asm/ldt.h>

#include <asm/segment.h>

#include <asm/desc_defs.h>



#ifndef __ASSEMBLY__



#include <linux/preempt.h>

#include <linux/percpu.h>



static inline void __set_tss_desc(unsigned int cpu, unsigned int entry, const void *addr)

{

	tss_desc tss;

	pack_descriptor(&tss, (unsigned long)addr,

			offsetof(struct tss_struct, __cacheline_filler) - 1,

			DESC_TSS, 0);

	write_gdt_entry(get_cpu_gdt_table(cpu), entry, &tss, DESC_TSS);

}





#define set_tss_desc(cpu,addr) __set_tss_desc(cpu, GDT_ENTRY_TSS, addr)



#endif /* !__ASSEMBLY__ */



#endif

include/asm-x86/desc_64.h

+0 −33
Original line number Diff line number Diff line 
/* Written 2000 by Andi Kleen */

#ifndef __ARCH_DESC_H

#define __ARCH_DESC_H

#include <linux/threads.h>

#include <asm/ldt.h>



#ifndef __ASSEMBLY__



#include <linux/string.h>



#include <asm/segment.h>



static inline void set_tss_desc(unsigned cpu, void *addr)

{

	struct desc_struct *d = get_cpu_gdt_table(cpu);

	tss_desc tss;



	/*

	 * sizeof(unsigned long) coming from an extra "long" at the end

	 * of the iobitmap. See tss_struct definition in processor.h

	 *

	 * -1? seg base+limit should be pointing to the address of the

	 * last valid byte

	 */

	set_tssldt_descriptor(&tss,

		(unsigned long)addr, DESC_TSS,

		IO_BITMAP_OFFSET + IO_BITMAP_BYTES + sizeof(unsigned long) - 1);

	write_gdt_entry(d, GDT_ENTRY_TSS, &tss, DESC_TSS);

}



#endif /* !__ASSEMBLY__ */



#endif