- Remove a FIXME.  Supporting PAGE_CACHE_SIZE != PAGE_SIZE is a "won't fix"
  for 2.6. (Bill Irwin)

- Remove dead label in copy_page_range().



 include/linux/pagemap.h |    2 +-
 mm/memory.c             |    2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff -puN include/linux/pagemap.h~misc include/linux/pagemap.h
--- 25/include/linux/pagemap.h~misc	2003-04-17 22:12:10.000000000 -0700
+++ 25-akpm/include/linux/pagemap.h	2003-04-17 22:12:10.000000000 -0700
@@ -169,7 +169,7 @@ extern void end_page_writeback(struct pa
 /*
  * Fault a userspace page into pagetables.  Return non-zero on a fault.
  *
- * FIXME: this assumes that two userspace pages are always sufficient.  That's
+ * This assumes that two userspace pages are always sufficient.  That's
  * not true if PAGE_CACHE_SIZE > PAGE_SIZE.
  */
 static inline int fault_in_pages_writeable(char *uaddr, int size)
diff -puN mm/memory.c~misc mm/memory.c
--- 25/mm/memory.c~misc	2003-04-17 22:15:19.000000000 -0700
+++ 25-akpm/mm/memory.c	2003-04-17 22:15:53.000000000 -0700
@@ -328,8 +328,6 @@ skip_copy_pte_range:
 				pte = pte_mkold(pte);
 				get_page(page);
 				dst->rss++;
-
-cont_copy_pte_range:
 				set_pte(dst_pte, pte);
 				pte_chain = page_add_rmap(page, dst_pte,
 							pte_chain);

_