git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
m32r
/
include
/
asm
/
mmu_context.h
diff --git
a/arch/m32r/include/asm/mmu_context.h
b/arch/m32r/include/asm/mmu_context.h
index
91909e5
..
a70a3df
100644
(file)
--- a/
arch/m32r/include/asm/mmu_context.h
+++ b/
arch/m32r/include/asm/mmu_context.h
@@
-127,7
+127,7
@@
static inline void switch_mm(struct mm_struct *prev,
if (prev != next) {
#ifdef CONFIG_SMP
if (prev != next) {
#ifdef CONFIG_SMP
- cpu
_set(cpu, next->cpu_vm_mask
);
+ cpu
mask_set_cpu(cpu, mm_cpumask(next)
);
#endif /* CONFIG_SMP */
/* Set MPTB = next->pgd */
*(volatile unsigned long *)MPTB = (unsigned long)next->pgd;
#endif /* CONFIG_SMP */
/* Set MPTB = next->pgd */
*(volatile unsigned long *)MPTB = (unsigned long)next->pgd;
@@
-135,7
+135,7
@@
static inline void switch_mm(struct mm_struct *prev,
}
#ifdef CONFIG_SMP
else
}
#ifdef CONFIG_SMP
else
- if (!cpu
_test_and_set(cpu, next->cpu_vm_mask
))
+ if (!cpu
mask_test_and_set_cpu(cpu, mm_cpumask(next)
))
activate_context(next);
#endif /* CONFIG_SMP */
}
activate_context(next);
#endif /* CONFIG_SMP */
}