[linuxsh-dev] 2.4 branch

[NIIBE Y. <gn...@m1...>]

I'll commit following change to 2.4 branch of our repository, 
if there's no objection.

2001-12-11  NIIBE Yutaka  <gn...@m1...>

	* arch/sh/kernel/pci-sh7751.c: Change Martin Mares' e-mail
	address as mainline.
	* mm/memory.c (do_wp_page): Re-introduce ifdef-out-ing
	flush_cache_page.
	* arch/sh/kernel/sys_sh.c-1.7: Removed.
	
Index: arch/sh/kernel/pci-sh7751.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/pci-sh7751.c,v
retrieving revision 1.1.1.1
diff -u -3 -p -r1.1.1.1 pci-sh7751.c
--- arch/sh/kernel/pci-sh7751.c	2001/10/15 20:44:49	1.1.1.1
+++ arch/sh/kernel/pci-sh7751.c	2001/12/11 09:30:00
@@ -3,7 +3,7 @@
  *
  *  Dustin McIntire (du...@se...)
  *	Derived from arch/i386/kernel/pci-*.c which bore the message:
- *	(c) 1999--2000 Martin Mares <mj...@su...>
+ *	(c) 1999--2000 Martin Mares <mj...@uc...>
  *	
  *  May be copied or modified under the terms of the GNU General Public
  *  License.  See linux/COPYING for more information.
Index: mm/memory.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/mm/memory.c,v
retrieving revision 1.1.1.1.2.2
diff -u -3 -p -r1.1.1.1.2.2 memory.c
--- mm/memory.c	2001/11/30 23:03:58	1.1.1.1.2.2
+++ mm/memory.c	2001/12/11 09:30:00
@@ -917,7 +917,9 @@ static int do_wp_page(struct mm_struct *
 		int reuse = can_share_swap_page(old_page);
 		unlock_page(old_page);
 		if (reuse) {
+#if 0 /* This is not needed for VIPT cache, performance goes bad if we flush */
 			flush_cache_page(vma, address);
+#endif
 			establish_pte(vma, address, page_table, pte_mkyoung(pte_mkdirty(pte_mkwrite(pte))));
 			spin_unlock(&mm->page_table_lock);
 			return 1;	/* Minor fault */
--