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

Commit bc3f5d3d authored by Alexander van Heukelum's avatar Alexander van Heukelum Committed by H. Peter Anvin
Browse files

x86: de-assembler-ize asm/desc.h 



asm/desc.h is included in three assembly files, but the only macro
it defines, GET_DESC_BASE, is never used. This patch removes the
includes, removes the macro GET_DESC_BASE and the ASSEMBLY guard
from asm/desc.h.

Signed-off-by: default avatarAlexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent dc4c2a0a

arch/x86/include/asm/desc.h

+0 −26
Original line number Diff line number Diff line 
#ifndef _ASM_X86_DESC_H

#define _ASM_X86_DESC_H



#ifndef __ASSEMBLY__

#include <asm/desc_defs.h>

#include <asm/ldt.h>

#include <asm/mmu.h>
@@ -380,29 +379,4 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist) 
	_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);

}



#else

/*

 * GET_DESC_BASE reads the descriptor base of the specified segment.

 *

 * Args:

 *    idx - descriptor index

 *    gdt - GDT pointer

 *    base - 32bit register to which the base will be written

 *    lo_w - lo word of the "base" register

 *    lo_b - lo byte of the "base" register

 *    hi_b - hi byte of the low word of the "base" register

 *

 * Example:

 *    GET_DESC_BASE(GDT_ENTRY_ESPFIX_SS, %ebx, %eax, %ax, %al, %ah)

 *    Will read the base address of GDT_ENTRY_ESPFIX_SS and put it into %eax.

 */

#define GET_DESC_BASE(idx, gdt, base, lo_w, lo_b, hi_b) \

	movb idx * 8 + 4(gdt), lo_b;			\

	movb idx * 8 + 7(gdt), hi_b;			\

	shll $16, base;					\

	movw idx * 8 + 2(gdt), lo_w;





#endif /* __ASSEMBLY__ */



#endif /* _ASM_X86_DESC_H */

arch/x86/kernel/entry_32.S

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ 
#include <asm/segment.h>

#include <asm/smp.h>

#include <asm/page_types.h>

#include <asm/desc.h>

#include <asm/percpu.h>

#include <asm/dwarf2.h>

#include <asm/processor-flags.h>

arch/x86/kernel/head_32.S

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <asm/segment.h>

#include <asm/page_types.h>

#include <asm/pgtable_types.h>

#include <asm/desc.h>

#include <asm/cache.h>

#include <asm/thread_info.h>

#include <asm/asm-offsets.h>

arch/x86/kernel/head_64.S

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/linkage.h>

#include <linux/threads.h>

#include <linux/init.h>

#include <asm/desc.h>

#include <asm/segment.h>

#include <asm/pgtable.h>

#include <asm/page.h>