Commit 2014d018 authored by Al Viro's avatar Al Viro Committed by Richard Weinberger
Browse files

um: merge host_ldt_{32,64}.h 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 09e129a6

arch/x86/um/shared/sysdep/host_ldt.h

+35 −3
Original line number Diff line number Diff line 
#ifdef __i386__

#include "host_ldt_32.h"

#ifndef __ASM_HOST_LDT_H

#define __ASM_HOST_LDT_H



#include <asm/ldt.h>



#define LDT_entry_a(info) \

	((((info)->base_addr & 0x0000ffff) << 16) | ((info)->limit & 0x0ffff))



#define LDT_entry_b(info) \

	(((info)->base_addr & 0xff000000) | \

	(((info)->base_addr & 0x00ff0000) >> 16) | \

	((info)->limit & 0xf0000) | \

	(((info)->read_exec_only ^ 1) << 9) | \

	((info)->contents << 10) | \

	(((info)->seg_not_present ^ 1) << 15) | \

	((info)->seg_32bit << 22) | \

	((info)->limit_in_pages << 23) | \

	((info)->useable << 20) | \

	0x7000)



#define _LDT_empty(info) (\

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

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

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

	(info)->read_exec_only	== 1	&& \

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

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

	(info)->seg_not_present	== 1	&& \

	(info)->useable		== 0	)



#ifdef CONFIG_X86_64

#define LDT_empty(info) (_LDT_empty(info) && ((info)->lm == 0))

#else

#include "host_ldt_64.h"

#define LDT_empty(info) (_LDT_empty(info))

#endif



#endif

arch/x86/um/shared/sysdep/host_ldt_32.h

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
#ifndef __ASM_HOST_LDT_I386_H

#define __ASM_HOST_LDT_I386_H



#include <asm/ldt.h>



/*

 * macros stolen from include/asm-i386/desc.h

 */

#define LDT_entry_a(info) \

	((((info)->base_addr & 0x0000ffff) << 16) | ((info)->limit & 0x0ffff))



#define LDT_entry_b(info) \

	(((info)->base_addr & 0xff000000) | \

	(((info)->base_addr & 0x00ff0000) >> 16) | \

	((info)->limit & 0xf0000) | \

	(((info)->read_exec_only ^ 1) << 9) | \

	((info)->contents << 10) | \

	(((info)->seg_not_present ^ 1) << 15) | \

	((info)->seg_32bit << 22) | \

	((info)->limit_in_pages << 23) | \

	((info)->useable << 20) | \

	0x7000)



#define LDT_empty(info) (\

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

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

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

	(info)->read_exec_only	== 1	&& \

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

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

	(info)->seg_not_present	== 1	&& \

	(info)->useable		== 0	)



#endif

arch/x86/um/shared/sysdep/host_ldt_64.h

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
#ifndef __ASM_HOST_LDT_X86_64_H

#define __ASM_HOST_LDT_X86_64_H



#include <asm/ldt.h>



/*

 * macros stolen from include/asm-x86_64/desc.h

 */

#define LDT_entry_a(info) \

	((((info)->base_addr & 0x0000ffff) << 16) | ((info)->limit & 0x0ffff))



/* Don't allow setting of the lm bit. It is useless anyways because

 * 64bit system calls require __USER_CS. */

#define LDT_entry_b(info) \

	(((info)->base_addr & 0xff000000) | \

	(((info)->base_addr & 0x00ff0000) >> 16) | \

	((info)->limit & 0xf0000) | \

	(((info)->read_exec_only ^ 1) << 9) | \

	((info)->contents << 10) | \

	(((info)->seg_not_present ^ 1) << 15) | \

	((info)->seg_32bit << 22) | \

	((info)->limit_in_pages << 23) | \

	((info)->useable << 20) | \

	/* ((info)->lm << 21) | */ \

	0x7000)



#define LDT_empty(info) (\

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

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

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

	(info)->read_exec_only	== 1	&& \

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

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

	(info)->seg_not_present	== 1	&& \

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

	(info)->lm              == 0)



#endif