Merge branch 'linus' into x86/xen

This commit is contained in:
Ingo Molnar
2008-07-31 12:38:04 +02:00
1011 changed files with 22323 additions and 12795 deletions

View File

@@ -64,12 +64,10 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
if (reload) {
#ifdef CONFIG_SMP
cpumask_of_cpu_ptr_declare(mask);
preempt_disable();
load_LDT(pc);
cpumask_of_cpu_ptr_next(mask, smp_processor_id());
if (!cpus_equal(current->mm->cpu_vm_mask, *mask))
if (!cpus_equal(current->mm->cpu_vm_mask,
cpumask_of_cpu(smp_processor_id())))
smp_call_function(flush_ldt, current->mm, 1);
preempt_enable();
#else