Merge branch 'fixes' into for-next

diff --cc arch/parisc/include/asm/cacheflush.h
index dc9286a,7344e1d..d18328b
--- 1/arch/parisc/include/asm/cacheflush.h
--- 2/arch/parisc/include/asm/cacheflush.h
+++ b/arch/parisc/include/asm/cacheflush.h
@@@ -96,16 -112,9 +113,9 @@@ static inline voi
  flush_anon_page(struct vm_area_struct *vma, struct page *page, unsigned long vmaddr)
  {
        if (PageAnon(page))
 -              flush_user_dcache_page(vmaddr);
 +              flush_dcache_page_asm(page_to_phys(page), vmaddr);
  }
  
- #define ARCH_HAS_FLUSH_KERNEL_DCACHE_PAGE
- void flush_kernel_dcache_page_addr(void *addr);
- static inline void flush_kernel_dcache_page(struct page *page)
- {
-       flush_kernel_dcache_page_addr(page_address(page));
- }
- 
  #ifdef CONFIG_DEBUG_RODATA
  void mark_rodata_ro(void);
  #endif