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

Commit efb21cc2 authored by Al Viro's avatar Al Viro Committed by H. Peter Anvin
Browse files

x86, um: untangle uml ldt.h 



* turn asm/ldt.h into ldt.h; update the (very few) users
* take host_ldt.h into sysdep, kill symlink mess
* includes of asm/arch/ldt.h turn into asm/ldt.h now

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 5077c2a9

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 processor.h ptrace.h \

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

	module.h vm-flags.h elf.h

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



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

arch/um/include/asm/processor-i386.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#define __UM_PROCESSOR_I386_H



#include "linux/string.h"

#include "asm/host_ldt.h"

#include <sysdep/host_ldt.h>

#include "asm/segment.h"



extern int host_has_cmov;

arch/um/include/asm/ptrace-x86_64.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


#include "linux/compiler.h"

#include "asm/errno.h"

#include "asm/host_ldt.h"

#include <sysdep/host_ldt.h>



#define __FRAME_OFFSETS /* Needed to get the R* macros */

#include "asm/ptrace-generic.h"

arch/um/include/asm/ldt.h→arch/um/include/shared/ldt.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#define __ASM_LDT_H



#include <linux/mutex.h>

#include "asm/host_ldt.h"

#include <sysdep/host_ldt.h>



extern void ldt_host_info(void);

arch/um/include/asm/host_ldt-i386.h→arch/um/include/shared/sysdep-i386/host_ldt.h

+1 −1
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"

#include <asm/ldt.h>



/*

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