[xtensa-cvscommit] linux/arch/xtensa/mm cache.c,1.9,1.10

[<joe...@us...>]

Update of /cvsroot/xtensa/linux/arch/xtensa/mm
In directory sc8-pr-cvs1:/tmp/cvs-serv2854/arch/xtensa/mm

Modified Files:
	cache.c 
Log Message:
Cache aliasing comments and conditionals only.


Index: cache.c
===================================================================
RCS file: /cvsroot/xtensa/linux/arch/xtensa/mm/cache.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** cache.c	1 Apr 2003 22:28:33 -0000	1.9
--- cache.c	25 Jul 2003 00:17:17 -0000	1.10
***************
*** 274,277 ****
--- 274,286 ----
  static struct semaphore dealias_page_sem;
  
+ /*
+  *  Normally, clear_user_page() is a macro in page.h
+  *  that maps to clear_page() that maps to clear_page_asm()
+  *  in loadmmu.c -- this simply zeroes all bytes in the
+  *  page pointed to by 'to'.
+  *
+  *  This version is used when there is page aliasing... (!?!?).
+  */
+ #if XTENSA_CACHE_ALIAS
  void clear_user_page(void *to, unsigned long address)
  {
***************
*** 309,313 ****
  		new_to = new_to + (address & XT_CACHE_ALIAS_BITS);
  		vpnval = new_to + WIRED_WAY_FOR_COPY_USER_PAGE;
! 		pteval = mk_pte( topage, PAGE_KERNEL);
  		down(&dealias_page_sem);
  		write_dtlb_entry(pteval, vpnval);
--- 318,322 ----
  		new_to = new_to + (address & XT_CACHE_ALIAS_BITS);
  		vpnval = new_to + WIRED_WAY_FOR_COPY_USER_PAGE;
! 		pteval = mk_pte( topage, PAGE_KERNEL);	/*FIXME: make this PAGE_USER!?!?*/
  		down(&dealias_page_sem);
  		write_dtlb_entry(pteval, vpnval);
***************
*** 327,330 ****
--- 336,340 ----
  	}
  }
+ #endif /* XTENSA_CACHE_ALIAS */
  
  
***************
*** 367,371 ****
  		new_to = new_to + (address & XT_CACHE_ALIAS_BITS);
  		vpnval = new_to + WIRED_WAY_FOR_COPY_USER_PAGE;
! 		pteval = mk_pte( topage, PAGE_KERNEL);
  		down(&dealias_page_sem);
  		write_dtlb_entry(pteval, vpnval);
--- 377,381 ----
  		new_to = new_to + (address & XT_CACHE_ALIAS_BITS);
  		vpnval = new_to + WIRED_WAY_FOR_COPY_USER_PAGE;
! 		pteval = mk_pte( topage, PAGE_KERNEL);	/*FIXME: make this PAGE_USER!?!?*/
  		down(&dealias_page_sem);
  		write_dtlb_entry(pteval, vpnval);