--- zzzz-none-000/linux-2.6.32.61/arch/mips/include/asm/page.h	2013-06-10 09:43:48.000000000 +0000
+++ ar9-7330-650/linux-2.6.32.61/arch/mips/include/asm/page.h	2013-08-22 09:11:22.000000000 +0000
@@ -55,8 +55,8 @@
  */
 #define ARCH_PFN_OFFSET		PFN_UP(PHYS_OFFSET)
 
-extern void clear_page(void * page);
-extern void copy_page(void * to, void * from);
+extern void (*clear_page)(void * page);
+extern void (*copy_page)(void * to, void * from);
 
 extern unsigned long shm_align_mask;
 
@@ -69,7 +69,7 @@
 struct page;
 
 static inline void clear_user_page(void *addr, unsigned long vaddr,
-	struct page *page)
+	struct page *page __attribute__ ((unused)))
 {
 	extern void (*flush_data_cache_page)(unsigned long addr);
 
@@ -200,8 +200,10 @@
 #define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
 				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
 
-#define UNCAC_ADDR(addr)	((addr) - PAGE_OFFSET + UNCAC_BASE)
-#define CAC_ADDR(addr)		((addr) - UNCAC_BASE + PAGE_OFFSET)
+/*--- #define UNCAC_ADDR(addr)	((addr) - PAGE_OFFSET + UNCAC_BASE) ---*/
+/*--- #define CAC_ADDR(addr)		((addr) - UNCAC_BASE + PAGE_OFFSET) ---*/
+#define UNCAC_ADDR(addr)	(typeof((addr)))KSEG1ADDR((unsigned long)(addr))
+#define CAC_ADDR(addr)		(typeof((addr)))KSEG0ADDR((unsigned long)(addr))
 
 #include <asm-generic/memory_model.h>
 #include <asm-generic/getorder.h>