diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | linux/dev/include/linux/head.h | 20 | ||||
| -rw-r--r-- | linux/src/include/linux/head.h | 3 |
3 files changed, 5 insertions, 22 deletions
@@ -11,6 +11,8 @@ [task #5878 --- ``Backport code from GNU Mach's trunk to gnumach-1-branch: i386_set_gdt, i386_get_gdt''] + [sync from HEAD, 2002-10-03] + * i386/include/mach/i386/mach_i386.defs (i386_set_gdt, i386_get_gdt): New routines. * i386/i386/user_ldt.c (i386_set_gdt, i386_get_gdt): New functions. @@ -19,7 +21,7 @@ * i386/i386/thread.h: Include `gdt.h'. (struct i386_machine_state): New member `user_gdt'. * i386/i386/pcb.c (switch_ktss): Copy those slots into the GDT. - * linux/dev/include/linux/head.h: New file. + * linux/src/include/linux/head.h (idt,gdt): Remove extern declaration. 2006-11-05 Samuel Thibault <samuel.thibault@ens-lyon.org> diff --git a/linux/dev/include/linux/head.h b/linux/dev/include/linux/head.h deleted file mode 100644 index c501f21..0000000 --- a/linux/dev/include/linux/head.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef _LINUX_HEAD_H -#define _LINUX_HEAD_H - -typedef struct desc_struct { - unsigned long a,b; -} desc_table[256]; - -/* XXX Linux code shouldn't use idt/gdt directly */ -/* extern desc_table idt,gdt; */ - -#define GDT_NUL 0 -#define GDT_CODE 1 -#define GDT_DATA 2 -#define GDT_TMP 3 - -#define LDT_NUL 0 -#define LDT_CODE 1 -#define LDT_DATA 2 - -#endif diff --git a/linux/src/include/linux/head.h b/linux/src/include/linux/head.h index 3829b1c..c501f21 100644 --- a/linux/src/include/linux/head.h +++ b/linux/src/include/linux/head.h @@ -5,7 +5,8 @@ typedef struct desc_struct { unsigned long a,b; } desc_table[256]; -extern desc_table idt,gdt; +/* XXX Linux code shouldn't use idt/gdt directly */ +/* extern desc_table idt,gdt; */ #define GDT_NUL 0 #define GDT_CODE 1 |