aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-08-18 01:26:38 -0400
committerH. Peter Anvin <hpa@zytor.com>2008-10-23 01:55:21 -0400
commitefb21cc2384e385c4873ac6e7b23f16659469ea9 (patch)
treee7da1bf7e0d02327a974ec5724e9209eeb9ec7ef
parent5077c2a9cd43e8db71f8257e745e1d27e7b79d3f (diff)
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: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--arch/um/Makefile2
-rw-r--r--arch/um/include/asm/processor-i386.h2
-rw-r--r--arch/um/include/asm/ptrace-x86_64.h2
-rw-r--r--arch/um/include/shared/ldt.h (renamed from arch/um/include/asm/ldt.h)2
-rw-r--r--arch/um/include/shared/sysdep-i386/host_ldt.h (renamed from arch/um/include/asm/host_ldt-i386.h)2
-rw-r--r--arch/um/include/shared/sysdep-i386/tls.h2
-rw-r--r--arch/um/include/shared/sysdep-x86_64/host_ldt.h (renamed from arch/um/include/asm/host_ldt-x86_64.h)2
-rw-r--r--arch/um/include/shared/sysdep-x86_64/tls.h2
-rw-r--r--arch/um/include/shared/um_mmu.h2
9 files changed, 9 insertions, 9 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 33d59f1ff57f..909d16b07a44 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -20,7 +20,7 @@ core-y += $(ARCH_DIR)/kernel/ \
20 20
21# Have to precede the include because the included Makefiles reference them. 21# Have to precede the include because the included Makefiles reference them.
22SYMLINK_HEADERS := archparam.h system.h processor.h ptrace.h \ 22SYMLINK_HEADERS := archparam.h system.h processor.h ptrace.h \
23 module.h vm-flags.h elf.h host_ldt.h 23 module.h vm-flags.h elf.h
24SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),$(ARCH_DIR)/include/asm/$(header)) 24SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),$(ARCH_DIR)/include/asm/$(header))
25 25
26# XXX: The "os" symlink is only used by arch/um/include/os.h, which includes 26# XXX: The "os" symlink is only used by arch/um/include/os.h, which includes
diff --git a/arch/um/include/asm/processor-i386.h b/arch/um/include/asm/processor-i386.h
index 4f8be0063639..82a9061ab5be 100644
--- a/arch/um/include/asm/processor-i386.h
+++ b/arch/um/include/asm/processor-i386.h
@@ -7,7 +7,7 @@
7#define __UM_PROCESSOR_I386_H 7#define __UM_PROCESSOR_I386_H
8 8
9#include "linux/string.h" 9#include "linux/string.h"
10#include "asm/host_ldt.h" 10#include <sysdep/host_ldt.h>
11#include "asm/segment.h" 11#include "asm/segment.h"
12 12
13extern int host_has_cmov; 13extern int host_has_cmov;
diff --git a/arch/um/include/asm/ptrace-x86_64.h b/arch/um/include/asm/ptrace-x86_64.h
index 4c475350dcf0..2653fbaa352e 100644
--- a/arch/um/include/asm/ptrace-x86_64.h
+++ b/arch/um/include/asm/ptrace-x86_64.h
@@ -9,7 +9,7 @@
9 9
10#include "linux/compiler.h" 10#include "linux/compiler.h"
11#include "asm/errno.h" 11#include "asm/errno.h"
12#include "asm/host_ldt.h" 12#include <sysdep/host_ldt.h>
13 13
14#define __FRAME_OFFSETS /* Needed to get the R* macros */ 14#define __FRAME_OFFSETS /* Needed to get the R* macros */
15#include "asm/ptrace-generic.h" 15#include "asm/ptrace-generic.h"
diff --git a/arch/um/include/asm/ldt.h b/arch/um/include/shared/ldt.h
index 52af512f5e7d..a7f999a58774 100644
--- a/arch/um/include/asm/ldt.h
+++ b/arch/um/include/shared/ldt.h
@@ -9,7 +9,7 @@
9#define __ASM_LDT_H 9#define __ASM_LDT_H
10 10
11#include <linux/mutex.h> 11#include <linux/mutex.h>
12#include "asm/host_ldt.h" 12#include <sysdep/host_ldt.h>
13 13
14extern void ldt_host_info(void); 14extern void ldt_host_info(void);
15 15
diff --git a/arch/um/include/asm/host_ldt-i386.h b/arch/um/include/shared/sysdep-i386/host_ldt.h
index b27cb0a9dd30..0953cc4df652 100644
--- a/arch/um/include/asm/host_ldt-i386.h
+++ b/arch/um/include/shared/sysdep-i386/host_ldt.h
@@ -1,7 +1,7 @@
1#ifndef __ASM_HOST_LDT_I386_H 1#ifndef __ASM_HOST_LDT_I386_H
2#define __ASM_HOST_LDT_I386_H 2#define __ASM_HOST_LDT_I386_H
3 3
4#include "asm/arch/ldt.h" 4#include <asm/ldt.h>
5 5
6/* 6/*
7 * macros stolen from include/asm-i386/desc.h 7 * macros stolen from include/asm-i386/desc.h
diff --git a/arch/um/include/shared/sysdep-i386/tls.h b/arch/um/include/shared/sysdep-i386/tls.h
index 918fd3c5ff9c..34550755b2a1 100644
--- a/arch/um/include/shared/sysdep-i386/tls.h
+++ b/arch/um/include/shared/sysdep-i386/tls.h
@@ -21,7 +21,7 @@ typedef struct um_dup_user_desc {
21 21
22# else /* __KERNEL__ */ 22# else /* __KERNEL__ */
23 23
24# include <asm/ldt.h> 24# include <ldt.h>
25typedef struct user_desc user_desc_t; 25typedef struct user_desc user_desc_t;
26 26
27# endif /* __KERNEL__ */ 27# endif /* __KERNEL__ */
diff --git a/arch/um/include/asm/host_ldt-x86_64.h b/arch/um/include/shared/sysdep-x86_64/host_ldt.h
index 74a63f7d9a90..e8b1be1e154f 100644
--- a/arch/um/include/asm/host_ldt-x86_64.h
+++ b/arch/um/include/shared/sysdep-x86_64/host_ldt.h
@@ -1,7 +1,7 @@
1#ifndef __ASM_HOST_LDT_X86_64_H 1#ifndef __ASM_HOST_LDT_X86_64_H
2#define __ASM_HOST_LDT_X86_64_H 2#define __ASM_HOST_LDT_X86_64_H
3 3
4#include "asm/arch/ldt.h" 4#include <asm/ldt.h>
5 5
6/* 6/*
7 * macros stolen from include/asm-x86_64/desc.h 7 * macros stolen from include/asm-x86_64/desc.h
diff --git a/arch/um/include/shared/sysdep-x86_64/tls.h b/arch/um/include/shared/sysdep-x86_64/tls.h
index 35f19f25bd3b..18c000d0357a 100644
--- a/arch/um/include/shared/sysdep-x86_64/tls.h
+++ b/arch/um/include/shared/sysdep-x86_64/tls.h
@@ -22,7 +22,7 @@ typedef struct um_dup_user_desc {
22 22
23# else /* __KERNEL__ */ 23# else /* __KERNEL__ */
24 24
25# include <asm/ldt.h> 25# include <ldt.h>
26typedef struct user_desc user_desc_t; 26typedef struct user_desc user_desc_t;
27 27
28# endif /* __KERNEL__ */ 28# endif /* __KERNEL__ */
diff --git a/arch/um/include/shared/um_mmu.h b/arch/um/include/shared/um_mmu.h
index f575ff91f2a0..4cc1ef4d022b 100644
--- a/arch/um/include/shared/um_mmu.h
+++ b/arch/um/include/shared/um_mmu.h
@@ -8,7 +8,7 @@
8 8
9#include "uml-config.h" 9#include "uml-config.h"
10#include "mm_id.h" 10#include "mm_id.h"
11#include "asm/ldt.h" 11#include "ldt.h"
12 12
13typedef struct mm_context { 13typedef struct mm_context {
14 struct mm_id id; 14 struct mm_id id;