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

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);