From: David S. Miller <davem@davemloft.net>
Date: Sun, 29 Mar 2009 22:44:22 +0000 (-0700)
Subject: Merge branch 'master' of ssh://master.kernel.org/home/ftp/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.30-rc1~603^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=ed223129a30de7d244ca9b59819f5532c9caf039

Merge branch 'master' of ssh:///home/ftp/linux/kernel/git/rusty/linux-2.6-cpumask-for-sparc

Conflicts:
	arch/sparc/kernel/smp_64.c
---

ed223129a30de7d244ca9b59819f5532c9caf039
diff --cc arch/sparc/kernel/smp_64.c
index 79457f682b5a,2de937c7232e..708e12a26b05
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@@ -1074,8 -1074,8 +1074,8 @@@ void smp_flush_tlb_pending(struct mm_st
  	u32 ctx = CTX_HWBITS(mm->context);
  	int cpu = get_cpu();
  
 -	if (mm == current->active_mm && atomic_read(&mm->mm_users) == 1)
 +	if (mm == current->mm && atomic_read(&mm->mm_users) == 1)
- 		mm->cpu_vm_mask = cpumask_of_cpu(cpu);
+ 		cpumask_copy(mm_cpumask(mm), cpumask_of(cpu));
  	else
  		smp_cross_call_masked(&xcall_flush_tlb_pending,
  				      ctx, nr, (unsigned long) vaddrs,