Fix GDT allocation for SMP guests.

Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>

diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/smpboot.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/smpboot.c
index 9e3efcd0adbb948b21b13180e4c91c75561b438c..dd5eb7b100ede1c266ce776e28e30576be64de23 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/smpboot.c
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/smpboot.c
@@ -853,7 +853,7 @@ static int __init do_boot_cpu(int apicid)
        atomic_set(&init_deasserted, 0);
 
 #if 1
-       cpu_gdt_descr[cpu].address = __get_free_page(GFP_KERNEL);
+       cpu_gdt_descr[cpu].address = __get_free_page(GFP_KERNEL|__GFP_ZERO);
        BUG_ON(cpu_gdt_descr[0].size > PAGE_SIZE);
        cpu_gdt_descr[cpu].size = cpu_gdt_descr[0].size;
        printk("GDT: copying %d bytes from %lx to %lx\n",

diff --git a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/smpboot.c b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/smpboot.c
index 4245ac202dab016b726f27b94376083383ade726..035a358efa6353e420356809fd27e4d4f3687ed8 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/smpboot.c
+++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/smpboot.c
@@ -739,7 +739,7 @@ static int __cpuinit do_boot_cpu(int cpu, int apicid)
        atomic_set(&init_deasserted, 0);
 
 #ifdef CONFIG_XEN
-       cpu_gdt_descr[cpu].address = __get_free_page(GFP_KERNEL);
+       cpu_gdt_descr[cpu].address = __get_free_page(GFP_KERNEL|__GFP_ZERO);
        BUG_ON(cpu_gdt_descr[0].size > PAGE_SIZE);
        cpu_gdt_descr[cpu].size = cpu_gdt_descr[0].size;
        memcpy((void *)cpu_gdt_descr[cpu].address,