diff options
| author | Rusty Russell | 2006-09-26 08:32:22 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-09-26 17:48:55 +0200 |
| commit | 05f4a3ec94281347e05c81eafefcfe5ea545c94c (patch) | |
| tree | 1eafe968ec90ccac5aee8737cd8d9feb877b2c40 /arch | |
| parent | [PATCH] apm: clean up module initalization (diff) | |
| download | kernel-qcow2-linux-05f4a3ec94281347e05c81eafefcfe5ea545c94c.tar.gz kernel-qcow2-linux-05f4a3ec94281347e05c81eafefcfe5ea545c94c.tar.xz kernel-qcow2-linux-05f4a3ec94281347e05c81eafefcfe5ea545c94c.zip | |
[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>
Diffstat (limited to 'arch')
| -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] = 0x000092000100ffffULL /* 16-bit real-mode 64k data at 0x00000100 */ }; -static struct -{ - unsigned short size __attribute__ ((packed)); - unsigned long long * base __attribute__ ((packed)); -} -real_mode_gdt = { sizeof (real_mode_gdt_entries) - 1, real_mode_gdt_entries }, -real_mode_idt = { 0x3ff, NULL }, -no_idt = { 0, NULL }; +static struct Xgt_desc_struct +real_mode_gdt = { sizeof (real_mode_gdt_entries) - 1, (long)real_mode_gdt_entries }, +real_mode_idt = { 0x3ff, 0 }, +no_idt = { 0, 0 }; /* This is 16-bit protected mode code to disable paging and the cache, |