aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/xen/smp.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-12-11 13:57:42 -0500
committerH. Peter Anvin <hpa@zytor.com>2009-12-11 13:57:42 -0500
commit5c6baba84e1ac6a79b266b40e17e692aab6604a1 (patch)
tree6ba34db1109107023d753dd9fd5c359b3b990a04 /arch/x86/xen/smp.c
parent893f38d144a4d96d2483cd7c3801d26e1b2c23e9 (diff)
parent3ef884b4c04e857c283cc77ca70ad8f638d94b0e (diff)
Merge commit 'linus/master' into x86/urgent
Diffstat (limited to 'arch/x86/xen/smp.c')
-rw-r--r--arch/x86/xen/smp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index 738da0cb0d8b..64757c0ba5fc 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -295,6 +295,7 @@ static int __cpuinit xen_cpu_up(unsigned int cpu)
295 (unsigned long)task_stack_page(idle) - 295 (unsigned long)task_stack_page(idle) -
296 KERNEL_STACK_OFFSET + THREAD_SIZE; 296 KERNEL_STACK_OFFSET + THREAD_SIZE;
297#endif 297#endif
298 xen_setup_runstate_info(cpu);
298 xen_setup_timer(cpu); 299 xen_setup_timer(cpu);
299 xen_init_lock_cpu(cpu); 300 xen_init_lock_cpu(cpu);
300 301