diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-16 00:48:32 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-16 00:48:32 -0400 |
| commit | ea88023b3491a384575ebcd5e8a449e841a28a24 (patch) | |
| tree | f46e3d8302e44dc55ce31823501e100472d29683 /arch/x86/kernel/doublefault_32.c | |
| parent | a6f15ade97989d414e9bf33874c9d5d1f39808ec (diff) | |
| parent | 0cb583fd2862f19ea88b02eb307d11c09e51e2f8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/kernel/vmlinux.lds.S
Diffstat (limited to 'arch/x86/kernel/doublefault_32.c')
| -rw-r--r-- | arch/x86/kernel/doublefault_32.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c index b4f14c6c09d9..37250fe490b1 100644 --- a/arch/x86/kernel/doublefault_32.c +++ b/arch/x86/kernel/doublefault_32.c | |||
| @@ -27,9 +27,7 @@ static void doublefault_fn(void) | |||
| 27 | 27 | ||
| 28 | if (ptr_ok(gdt)) { | 28 | if (ptr_ok(gdt)) { |
| 29 | gdt += GDT_ENTRY_TSS << 3; | 29 | gdt += GDT_ENTRY_TSS << 3; |
| 30 | tss = *(u16 *)(gdt+2); | 30 | tss = get_desc_base((struct desc_struct *)gdt); |
| 31 | tss += *(u8 *)(gdt+4) << 16; | ||
| 32 | tss += *(u8 *)(gdt+7) << 24; | ||
| 33 | printk(KERN_EMERG "double fault, tss at %08lx\n", tss); | 31 | printk(KERN_EMERG "double fault, tss at %08lx\n", tss); |
| 34 | 32 | ||
| 35 | if (ptr_ok(tss)) { | 33 | if (ptr_ok(tss)) { |