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

Commit fbdf2161 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] uml: split ldt.h in arch-independent and arch-dependant code 



ldt-{i386,x86_64}.h is made of two different parts - some code for parsing of
LDT descriptors, which is arch-dependant, and the code to handle uml_ldt_t (an
LDT block inside UML), which is mostly arch-independant (among x86 and x86_64,
at least).

Join the common part in a single file (ldt.h) and split the rest away
(host_ldt-{i386,x86_64}.h).

This is needed because processor.h, with next patches, will start including
the LDT descriptor parsing macros in host_ldt.h, but it can't include ldt.h
because it uses semaphores (and to define semaphores one must first include
processor.h!).

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 12523bdc

arch/um/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ core-y += $(ARCH_DIR)/kernel/ \ 


# Have to precede the include because the included Makefiles reference them.

SYMLINK_HEADERS := archparam.h system.h sigcontext.h processor.h ptrace.h \

	module.h vm-flags.h elf.h ldt.h

	module.h vm-flags.h elf.h host_ldt.h

SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),include/asm-um/$(header))



# XXX: The "os" symlink is only used by arch/um/include/os.h, which includes

include/asm-um/host_ldt-i386.h

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

#define __ASM_HOST_LDT_I386_H



#include "asm/arch/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

include/asm-um/ldt-x86_64.h→include/asm-um/host_ldt-x86_64.h

+2 −37
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2004 Fujitsu Siemens Computers GmbH

 * Licensed under the GPL

 *

 * Author: Bodo Stroesser <bstroesser@fujitsu-siemens.com>

 */

#ifndef __ASM_HOST_LDT_X86_64_H

#define __ASM_HOST_LDT_X86_64_H



#ifndef __ASM_LDT_X86_64_H

#define __ASM_LDT_X86_64_H



#include "asm/semaphore.h"

#include "asm/arch/ldt.h"



struct mmu_context_skas;

extern void ldt_host_info(void);

extern long init_new_ldt(struct mmu_context_skas * to_mm,

			 struct mmu_context_skas * from_mm);

extern void free_ldt(struct mmu_context_skas * mm);



#define LDT_PAGES_MAX \

	((LDT_ENTRIES * LDT_ENTRY_SIZE)/PAGE_SIZE)

#define LDT_ENTRIES_PER_PAGE \

	(PAGE_SIZE/LDT_ENTRY_SIZE)

#define LDT_DIRECT_ENTRIES \

	((LDT_PAGES_MAX*sizeof(void *))/LDT_ENTRY_SIZE)



struct ldt_entry {

	__u32 a;

	__u32 b;

};



typedef struct uml_ldt {

	int entry_count;

	struct semaphore semaphore;

	union {

		struct ldt_entry * pages[LDT_PAGES_MAX];

		struct ldt_entry entries[LDT_DIRECT_ENTRIES];

	} u;

} uml_ldt_t;



/*

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

 */

include/asm-um/ldt-i386.h→include/asm-um/ldt.h

+41 −0
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ 
 * Author: Bodo Stroesser <bstroesser@fujitsu-siemens.com>

 */



#ifndef __ASM_LDT_I386_H

#define __ASM_LDT_I386_H

#ifndef __ASM_LDT_H

#define __ASM_LDT_H



#include "asm/semaphore.h"

#include "asm/arch/ldt.h"

#include "asm/host_ldt.h"



struct mmu_context_skas;

extern void ldt_host_info(void);
@@ -38,32 +38,4 @@ typedef struct uml_ldt { 
	} u;

} uml_ldt_t;



/*

 * 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