From efb21cc2384e385c4873ac6e7b23f16659469ea9 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 18 Aug 2008 01:26:38 -0400
Subject: [PATCH] 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>
---
arch/um/Makefile | 2 +-
arch/um/include/asm/processor-i386.h | 2 +-
arch/um/include/asm/ptrace-x86_64.h | 2 +-
arch/um/include/{asm => shared}/ldt.h | 2 +-
.../{asm/host_ldt-i386.h => shared/sysdep-i386/host_ldt.h} | 2 +-
arch/um/include/shared/sysdep-i386/tls.h | 2 +-
.../{asm/host_ldt-x86_64.h => shared/sysdep-x86_64/host_ldt.h} | 2 +-
arch/um/include/shared/sysdep-x86_64/tls.h | 2 +-
arch/um/include/shared/um_mmu.h | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
rename arch/um/include/{asm => shared}/ldt.h (95%)
rename arch/um/include/{asm/host_ldt-i386.h => shared/sysdep-i386/host_ldt.h} (97%)
rename arch/um/include/{asm/host_ldt-x86_64.h => shared/sysdep-x86_64/host_ldt.h} (97%)
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 33d59f1ff57fb..909d16b07a446 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -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
diff --git a/arch/um/include/asm/processor-i386.h b/arch/um/include/asm/processor-i386.h
index 4f8be00636391..82a9061ab5be6 100644
--- a/arch/um/include/asm/processor-i386.h
+++ b/arch/um/include/asm/processor-i386.h
@@ -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;
diff --git a/arch/um/include/asm/ptrace-x86_64.h b/arch/um/include/asm/ptrace-x86_64.h
index 4c475350dcf02..2653fbaa352e6 100644
--- a/arch/um/include/asm/ptrace-x86_64.h
+++ b/arch/um/include/asm/ptrace-x86_64.h
@@ -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"
diff --git a/arch/um/include/asm/ldt.h b/arch/um/include/shared/ldt.h
similarity index 95%
rename from arch/um/include/asm/ldt.h
rename to arch/um/include/shared/ldt.h
index 52af512f5e7dc..a7f999a58774d 100644
--- a/arch/um/include/asm/ldt.h
+++ b/arch/um/include/shared/ldt.h
@@ -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);
diff --git a/arch/um/include/asm/host_ldt-i386.h b/arch/um/include/shared/sysdep-i386/host_ldt.h
similarity index 97%
rename from arch/um/include/asm/host_ldt-i386.h
rename to arch/um/include/shared/sysdep-i386/host_ldt.h
index b27cb0a9dd30a..0953cc4df6528 100644
--- a/arch/um/include/asm/host_ldt-i386.h
+++ b/arch/um/include/shared/sysdep-i386/host_ldt.h
@@ -1,7 +1,7 @@
#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
diff --git a/arch/um/include/shared/sysdep-i386/tls.h b/arch/um/include/shared/sysdep-i386/tls.h
index 918fd3c5ff9ca..34550755b2a16 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 {
# else /* __KERNEL__ */
-# include <asm/ldt.h>
+# include <ldt.h>
typedef struct user_desc user_desc_t;
# 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
similarity index 97%
rename from arch/um/include/asm/host_ldt-x86_64.h
rename to arch/um/include/shared/sysdep-x86_64/host_ldt.h
index 74a63f7d9a90b..e8b1be1e154f4 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 @@
#ifndef __ASM_HOST_LDT_X86_64_H
#define __ASM_HOST_LDT_X86_64_H
-#include "asm/arch/ldt.h"
+#include <asm/ldt.h>
/*
* 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 35f19f25bd3b7..18c000d0357a3 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 {
# else /* __KERNEL__ */
-# include <asm/ldt.h>
+# include <ldt.h>
typedef struct user_desc user_desc_t;
# endif /* __KERNEL__ */
diff --git a/arch/um/include/shared/um_mmu.h b/arch/um/include/shared/um_mmu.h
index f575ff91f2a01..4cc1ef4d022b1 100644
--- a/arch/um/include/shared/um_mmu.h
+++ b/arch/um/include/shared/um_mmu.h
@@ -8,7 +8,7 @@
#include "uml-config.h"
#include "mm_id.h"
-#include "asm/ldt.h"
+#include "ldt.h"
typedef struct mm_context {
struct mm_id id;
--
GitLab