X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-um%2Fldt.h;h=96f82a456ce6515b781b44ef676034d402af1cfb;hb=887e5d5fcc96e3a7c91e19d9bb419c10196ffdc1;hp=4466ff6de0fde32afdd449c7f10959563ecaef4d;hpb=8006fdd6dc387abaa4b683bda4868c879fd76070;p=linux-2.6-omap-h63xx.git

diff --git a/include/asm-um/ldt.h b/include/asm-um/ldt.h
index 4466ff6de0f..96f82a456ce 100644
--- a/include/asm-um/ldt.h
+++ b/include/asm-um/ldt.h
@@ -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);
@@ -35,40 +35,7 @@ typedef struct uml_ldt {
 	union {
 		struct ldt_entry * pages[LDT_PAGES_MAX];
 		struct ldt_entry entries[LDT_DIRECT_ENTRIES];
-	};
+	} 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
-#ifndef __UM_LDT_H
-#define __UM_LDT_H
-
-#include "asm/arch/ldt.h"
 #endif