aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-10 14:35:55 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-10 14:35:55 -0700
commit83dc3d43ce06d3466f48046577331d06a40b8344 (patch)
tree0c2583b7424c6474b78c2408f73369e953920795
parentd8612417b2f78767b96ca434b50d23e5cdfcde07 (diff)
parentce29a1f8bd99aac409904b4ca4fd700e67802556 (diff)
downloadlinux-yocto-4.8-83dc3d43ce06d3466f48046577331d06a40b8344.tar.gz
linux-yocto-4.8-83dc3d43ce06d3466f48046577331d06a40b8344.tar.bz2
linux-yocto-4.8-83dc3d43ce06d3466f48046577331d06a40b8344.zip
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
-rw-r--r--arch/i386/boot/pm.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/i386/boot/pm.c b/arch/i386/boot/pm.c
index 6be9ca811d17..09fb342cc62e 100644
--- a/arch/i386/boot/pm.c
+++ b/arch/i386/boot/pm.c
@@ -122,7 +122,11 @@ static void setup_gdt(void)
/* DS: data, read/write, 4 GB, base 0 */
[GDT_ENTRY_BOOT_DS] = GDT_ENTRY(0xc093, 0, 0xfffff),
};
- struct gdt_ptr gdt;
+ /* Xen HVM incorrectly stores a pointer to the gdt_ptr, instead
+ of the gdt_ptr contents. Thus, make it static so it will
+ stay in memory, at least long enough that we switch to the
+ proper kernel GDT. */
+ static struct gdt_ptr gdt;
gdt.len = sizeof(boot_gdt)-1;
gdt.ptr = (u32)&boot_gdt + (ds() << 4);