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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
cacheflush.h
diff --git
a/arch/arm/include/asm/cacheflush.h
b/arch/arm/include/asm/cacheflush.h
index
1a711ea
..
fd03fb6
100644
(file)
--- a/
arch/arm/include/asm/cacheflush.h
+++ b/
arch/arm/include/asm/cacheflush.h
@@
-334,14
+334,14
@@
static inline void outer_flush_range(unsigned long start, unsigned long end)
#ifndef CONFIG_CPU_CACHE_VIPT
static inline void flush_cache_mm(struct mm_struct *mm)
{
#ifndef CONFIG_CPU_CACHE_VIPT
static inline void flush_cache_mm(struct mm_struct *mm)
{
- if (cpu
_isset(smp_processor_id(), mm->cpu_vm_mask
))
+ if (cpu
mask_test_cpu(smp_processor_id(), mm_cpumask(mm)
))
__cpuc_flush_user_all();
}
static inline void
flush_cache_range(struct vm_area_struct *vma, unsigned long start, unsigned long end)
{
__cpuc_flush_user_all();
}
static inline void
flush_cache_range(struct vm_area_struct *vma, unsigned long start, unsigned long end)
{
- if (cpu
_isset(smp_processor_id(), vma->vm_mm->cpu_vm_mask
))
+ if (cpu
mask_test_cpu(smp_processor_id(), mm_cpumask(vma->vm_mm)
))
__cpuc_flush_user_range(start & PAGE_MASK, PAGE_ALIGN(end),
vma->vm_flags);
}
__cpuc_flush_user_range(start & PAGE_MASK, PAGE_ALIGN(end),
vma->vm_flags);
}
@@
-349,7
+349,7
@@
flush_cache_range(struct vm_area_struct *vma, unsigned long start, unsigned long
static inline void
flush_cache_page(struct vm_area_struct *vma, unsigned long user_addr, unsigned long pfn)
{
static inline void
flush_cache_page(struct vm_area_struct *vma, unsigned long user_addr, unsigned long pfn)
{
- if (cpu
_isset(smp_processor_id(), vma->vm_mm->cpu_vm_mask
)) {
+ if (cpu
mask_test_cpu(smp_processor_id(), mm_cpumask(vma->vm_mm)
)) {
unsigned long addr = user_addr & PAGE_MASK;
__cpuc_flush_user_range(addr, addr + PAGE_SIZE, vma->vm_flags);
}
unsigned long addr = user_addr & PAGE_MASK;
__cpuc_flush_user_range(addr, addr + PAGE_SIZE, vma->vm_flags);
}
@@
-360,7
+360,7
@@
flush_ptrace_access(struct vm_area_struct *vma, struct page *page,
unsigned long uaddr, void *kaddr,
unsigned long len, int write)
{
unsigned long uaddr, void *kaddr,
unsigned long len, int write)
{
- if (cpu
_isset(smp_processor_id(), vma->vm_mm->cpu_vm_mask
)) {
+ if (cpu
mask_test_cpu(smp_processor_id(), mm_cpumask(vma->vm_mm)
)) {
unsigned long addr = (unsigned long)kaddr;
__cpuc_coherent_kern_range(addr, addr + len);
}
unsigned long addr = (unsigned long)kaddr;
__cpuc_coherent_kern_range(addr, addr + len);
}