diff options
author | James Bottomley <jbottomley@parallels.com> | 2011-05-22 03:04:55 -0400 |
---|---|---|
committer | James Bottomley <jbottomley@parallels.com> | 2011-05-22 03:04:55 -0400 |
commit | 7fe2ac6882f74e8bd5b3891f63c09cb10aee9d03 (patch) | |
tree | 3358215354ae27d86411963ab33c2d8f07c5e427 /arch/parisc/include/asm/cacheflush.h | |
parent | 2e7bad5f34b5beed47542490c760ed26574e38ba (diff) | |
parent | b7d45818444a31948cfc7849136013a0ea54b2fb (diff) |
Merge branch 'flushing' into for-linus
Diffstat (limited to 'arch/parisc/include/asm/cacheflush.h')
-rw-r--r-- | arch/parisc/include/asm/cacheflush.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/cacheflush.h b/arch/parisc/include/asm/cacheflush.h index d18328b3f938..da601dd34c05 100644 --- a/arch/parisc/include/asm/cacheflush.h +++ b/arch/parisc/include/asm/cacheflush.h | |||
@@ -3,6 +3,7 @@ | |||
3 | 3 | ||
4 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
5 | #include <linux/uaccess.h> | 5 | #include <linux/uaccess.h> |
6 | #include <asm/tlbflush.h> | ||
6 | 7 | ||
7 | /* The usual comment is "Caches aren't brain-dead on the <architecture>". | 8 | /* The usual comment is "Caches aren't brain-dead on the <architecture>". |
8 | * Unfortunately, that doesn't apply to PA-RISC. */ | 9 | * Unfortunately, that doesn't apply to PA-RISC. */ |
@@ -112,8 +113,10 @@ void flush_dcache_page_asm(unsigned long phys_addr, unsigned long vaddr); | |||
112 | static inline void | 113 | static inline void |
113 | flush_anon_page(struct vm_area_struct *vma, struct page *page, unsigned long vmaddr) | 114 | flush_anon_page(struct vm_area_struct *vma, struct page *page, unsigned long vmaddr) |
114 | { | 115 | { |
115 | if (PageAnon(page)) | 116 | if (PageAnon(page)) { |
117 | flush_tlb_page(vma, vmaddr); | ||
116 | flush_dcache_page_asm(page_to_phys(page), vmaddr); | 118 | flush_dcache_page_asm(page_to_phys(page), vmaddr); |
119 | } | ||
117 | } | 120 | } |
118 | 121 | ||
119 | #ifdef CONFIG_DEBUG_RODATA | 122 | #ifdef CONFIG_DEBUG_RODATA |