[Xen-changelog] Merged.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID c4c0bded343a66b18a221ae537cd1b78692afed4
# Parent  b817237922740a15c3f4a70fe6b5644f752aad2a
# Parent  e813ac9f7d23783a9c2d1f342ae46128fb3afa36
Merged.

diff -r b81723792274 -r c4c0bded343a 
linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c
--- a/linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c    Fri Oct 21 14:31:51 2005
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c    Fri Oct 21 14:34:17 2005
@@ -179,6 +179,8 @@
        ctxt.syscall_callback_eip  = (unsigned long)system_call;
 
        ctxt.ctrlreg[3] = virt_to_mfn(init_level4_pgt) << PAGE_SHIFT;
+
+       ctxt.gs_base_kernel = (unsigned long)(cpu_pda + vcpu);
 #endif
 
        BUG_ON(HYPERVISOR_vcpu_op(VCPUOP_initialise, vcpu, &ctxt));
@@ -207,6 +209,13 @@
                idle = fork_idle(cpu);
                if (IS_ERR(idle))
                        panic("failed fork for CPU %d", cpu);
+
+#ifdef __x86_64__
+               cpu_pda[cpu].pcurrent = idle;
+               cpu_pda[cpu].cpunumber = cpu;
+               per_cpu(init_tss,cpu).rsp0 = idle->thread.rsp;
+               clear_ti_thread_flag(idle->thread_info, TIF_FORK);
+#endif
 
                irq_ctx_init(cpu);
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog