diff options
| author | Jeff Dike <jdike@addtoit.com> | 2005-11-21 21:32:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-22 09:13:41 -0800 |
| commit | e23181deec0d2a8be576faf9d71211abb84d5ccc (patch) | |
| tree | 012a6ef362ae469e632d3490bf14b2b09ad4015e /include | |
| parent | 39d730ab87f07592e3a3794353f097d5184cae7a (diff) | |
| download | talos-op-linux-e23181deec0d2a8be576faf9d71211abb84d5ccc.tar.gz talos-op-linux-e23181deec0d2a8be576faf9d71211abb84d5ccc.zip | |
[PATCH] uml: eliminate anonymous union and clean up symlink lossage
This gives a name to the anonymous union introduced in skas-hold-own-ldt,
allowing to build on a wider range of gccs.
It also removes ldt.h, which somehow became real, and replaces it with a
symlink, and creates ldt-x86_64.h as a copy of ldt-i386.h for now.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-um/ldt-i386.h | 2 | ||||
| -rw-r--r-- | include/asm-um/ldt-x86_64.h (renamed from include/asm-um/ldt.h) | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/include/asm-um/ldt-i386.h b/include/asm-um/ldt-i386.h index b42662929b6c..175722a91164 100644 --- a/include/asm-um/ldt-i386.h +++ b/include/asm-um/ldt-i386.h @@ -35,7 +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; /* diff --git a/include/asm-um/ldt.h b/include/asm-um/ldt-x86_64.h index 4466ff6de0fd..175722a91164 100644 --- a/include/asm-um/ldt.h +++ b/include/asm-um/ldt-x86_64.h @@ -35,7 +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; /* @@ -67,8 +67,3 @@ typedef struct uml_ldt { (info)->useable == 0 ) #endif -#ifndef __UM_LDT_H -#define __UM_LDT_H - -#include "asm/arch/ldt.h" -#endif |
