diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2006-09-26 02:32:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-26 11:48:55 -0400 |
commit | 05f4a3ec94281347e05c81eafefcfe5ea545c94c (patch) | |
tree | 1eafe968ec90ccac5aee8737cd8d9feb877b2c40 | |
parent | c94a62aae6ebc99b416e55c023b6f5a1d19a400b (diff) |
[PATCH] x86: remove locally-defined ldt structure in favour of standard type
arch/i386/kernel/reboot.c defines its own struct to describe an ldt entry: it
should use struct Xgt_desc_struct (currently load_ldt is a macro, so doesn't
complain: paravirt patches make it warn).
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | arch/i386/kernel/reboot.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/i386/kernel/reboot.c b/arch/i386/kernel/reboot.c index 54cfeabbc5e4..84278e0093a2 100644 --- a/arch/i386/kernel/reboot.c +++ b/arch/i386/kernel/reboot.c | |||
@@ -145,14 +145,10 @@ real_mode_gdt_entries [3] = | |||
145 | 0x000092000100ffffULL /* 16-bit real-mode 64k data at 0x00000100 */ | 145 | 0x000092000100ffffULL /* 16-bit real-mode 64k data at 0x00000100 */ |
146 | }; | 146 | }; |
147 | 147 | ||
148 | static struct | 148 | static struct Xgt_desc_struct |
149 | { | 149 | real_mode_gdt = { sizeof (real_mode_gdt_entries) - 1, (long)real_mode_gdt_entries }, |
150 | unsigned short size __attribute__ ((packed)); | 150 | real_mode_idt = { 0x3ff, 0 }, |
151 | unsigned long long * base __attribute__ ((packed)); | 151 | no_idt = { 0, 0 }; |
152 | } | ||
153 | real_mode_gdt = { sizeof (real_mode_gdt_entries) - 1, real_mode_gdt_entries }, | ||
154 | real_mode_idt = { 0x3ff, NULL }, | ||
155 | no_idt = { 0, NULL }; | ||
156 | 152 | ||
157 | 153 | ||
158 | /* This is 16-bit protected mode code to disable paging and the cache, | 154 | /* This is 16-bit protected mode code to disable paging and the cache, |