Merge branch 'core/percpu' into x86/paravirt

[linux-2.6-omap-h63xx.git] / arch / x86 / xen / enlighten.c

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index ff6d530ccc7778f27198aeb407cb18223af24b02..cd022c43dfbc7d637d00d580c3431bd24dd1f0a2 100644 (file)
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -917,6 +917,9 @@ asmlinkage void __init xen_start_kernel(void)
        have_vcpu_info_placement = 0;
 #endif
 
+       /* setup percpu state */
+       load_percpu_segment(0);
+
        xen_smp_init();
 
        /* Get mfn list */