diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 13:09:00 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 13:09:00 +0100 |
| commit | b233969eaa98c7b339d955fe25a58bf6bf25739a (patch) | |
| tree | 96c372824bfe05cae4b2b2b57c96719d633296da /arch/x86/mach-voyager/voyager_smp.c | |
| parent | d040c1614c24162adc3fe106b182596999264e26 (diff) | |
| parent | 54321d947ae9d6a051b81e3eccaf2d8658aeecc6 (diff) | |
Merge branch 'x86/untangle2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into x86/headers
Conflicts:
arch/x86/include/asm/page.h
arch/x86/include/asm/pgtable.h
arch/x86/mach-voyager/voyager_smp.c
arch/x86/mm/fault.c
Diffstat (limited to 'arch/x86/mach-voyager/voyager_smp.c')
| -rw-r--r-- | arch/x86/mach-voyager/voyager_smp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c index 6f5a38c7f90..98e3c2bc756 100644 --- a/arch/x86/mach-voyager/voyager_smp.c +++ b/arch/x86/mach-voyager/voyager_smp.c @@ -1747,10 +1747,11 @@ static void __cpuinit voyager_smp_prepare_boot_cpu(void) int cpu = smp_processor_id(); switch_to_new_gdt(cpu); - cpu_online_map = cpumask_of_cpu(smp_processor_id()); - cpu_callout_map = cpumask_of_cpu(smp_processor_id()); - cpu_callin_map = CPU_MASK_NONE; - cpu_present_map = cpumask_of_cpu(smp_processor_id()); + cpu_set(cpu, cpu_online_map); + cpu_set(cpu, cpu_callout_map); + cpu_set(cpu, cpu_possible_map); + cpu_set(cpu, cpu_present_map); + } static int __cpuinit voyager_cpu_up(unsigned int cpu) |