tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
[x86 setup] Work around bug in Xen HVM

Linus Torvalds 83dc3d43 d8612417

+5 -1
unified split
+5 -1
arch/i386/boot/pm.c
··· 122 /* DS: data, read/write, 4 GB, base 0 */ 123 [GDT_ENTRY_BOOT_DS] = GDT_ENTRY(0xc093, 0, 0xfffff), 124 }; 125 - struct gdt_ptr gdt; 126 127 gdt.len = sizeof(boot_gdt)-1; 128 gdt.ptr = (u32)&boot_gdt + (ds() << 4);
··· 122 /* DS: data, read/write, 4 GB, base 0 */ 123 [GDT_ENTRY_BOOT_DS] = GDT_ENTRY(0xc093, 0, 0xfffff), 124 }; 125 + /* Xen HVM incorrectly stores a pointer to the gdt_ptr, instead 126 + of the gdt_ptr contents. Thus, make it static so it will 127 + stay in memory, at least long enough that we switch to the 128 + proper kernel GDT. */ 129 + static struct gdt_ptr gdt; 130 131 gdt.len = sizeof(boot_gdt)-1; 132 gdt.ptr = (u32)&boot_gdt + (ds() << 4);