From: James Bottomley <James.Bottomley@suse.de>
Date: Thu, 10 Feb 2011 17:20:53 +0000 (-0600)
Subject: Merge branch 'fixes' into for-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2c250ad23d438fa56e1beded374e44dc565c6c47;p=linux-beck.git

Merge branch 'fixes' into for-next
---

2c250ad23d438fa56e1beded374e44dc565c6c47
diff --cc arch/parisc/include/asm/cacheflush.h
index dc9286a4dcc7,7344e1d304af..d18328b3f938
--- a/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