diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-04 19:58:26 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-04 19:58:26 -0500 |
commit | 327641da8e3e227f42690479182b896fd19486be (patch) | |
tree | 05fa7f317e854f2da5d46d4c8977486d71bb2b21 /arch/x86/xen/enlighten.c | |
parent | 1f4f931501e9270c156d05ee76b7b872de486304 (diff) | |
parent | ef3892bd63420380d115f755d351d2071f1f805f (diff) |
Merge branch 'core/percpu' into x86/paravirt
Diffstat (limited to 'arch/x86/xen/enlighten.c')
-rw-r--r-- | arch/x86/xen/enlighten.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index ff6d530ccc77..cd022c43dfbc 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
@@ -917,6 +917,9 @@ asmlinkage void __init xen_start_kernel(void) | |||
917 | have_vcpu_info_placement = 0; | 917 | have_vcpu_info_placement = 0; |
918 | #endif | 918 | #endif |
919 | 919 | ||
920 | /* setup percpu state */ | ||
921 | load_percpu_segment(0); | ||
922 | |||
920 | xen_smp_init(); | 923 | xen_smp_init(); |
921 | 924 | ||
922 | /* Get mfn list */ | 925 | /* Get mfn list */ |