diff -prauN pgcl-2.6.0-test5-bk3-15/arch/i386/mm/discontig.c pgcl-2.6.0-test5-bk3-16/arch/i386/mm/discontig.c --- pgcl-2.6.0-test5-bk3-15/arch/i386/mm/discontig.c 2003-11-27 09:52:41.000000000 -0800 +++ pgcl-2.6.0-test5-bk3-16/arch/i386/mm/discontig.c 2003-11-27 13:43:49.000000000 -0800 @@ -433,9 +433,6 @@ void __init set_highmem_pages_init(int b zone_start_pfn + PAGE_MMUCOUNT*node_pfn); } } - if (page_to_pfn(&zone_mem_map[node_pfn])/PAGE_MMUCOUNT - == 0xffd38/PAGE_MMUCOUNT) - printk("saw the bad page!\n"); one_highpage_init(&zone_mem_map[node_pfn], zone_start_pfn + PAGE_MMUCOUNT*node_pfn, bad_ppro); diff -prauN pgcl-2.6.0-test5-bk3-15/arch/i386/mm/fault.c pgcl-2.6.0-test5-bk3-16/arch/i386/mm/fault.c --- pgcl-2.6.0-test5-bk3-15/arch/i386/mm/fault.c 2003-11-27 07:54:57.000000000 -0800 +++ pgcl-2.6.0-test5-bk3-16/arch/i386/mm/fault.c 2003-11-27 13:43:57.000000000 -0800 @@ -4,8 +4,6 @@ * Copyright (C) 1995 Linus Torvalds */ -#define DEBUG - #include #include #include diff -prauN pgcl-2.6.0-test5-bk3-15/arch/i386/mm/highmem.c pgcl-2.6.0-test5-bk3-16/arch/i386/mm/highmem.c --- pgcl-2.6.0-test5-bk3-15/arch/i386/mm/highmem.c 2003-11-27 10:42:28.000000000 -0800 +++ pgcl-2.6.0-test5-bk3-16/arch/i386/mm/highmem.c 2003-11-27 13:44:58.000000000 -0800 @@ -49,10 +49,6 @@ void *kmap_atomic(struct page *page, enu BUG_ON(vaddr < __fix_to_virt(FIX_KMAP_END)); pfn = page_to_pfn(page); - if (pfn/PAGE_MMUCOUNT == 0xffd38/PAGE_MMUCOUNT) { - printk("saw bad pfn in kmap_atomic()!\n"); - BUG(); - } addr = vaddr; pgd = pgd_offset_k(addr); @@ -158,8 +154,6 @@ void kmap_atomic_sg(pte_t *ptes[], pte_a for (k = 0; k < PAGE_MMUCOUNT; ++k, vaddr += MMUPAGE_SIZE) { unsigned long pfn = paddrs[k]/MMUPAGE_SIZE; - BUG_ON(pfn/PAGE_MMUCOUNT == 0xffd38/PAGE_MMUCOUNT); - if (!paddrs[k]) { ptes[k] = NULL; continue; diff -prauN pgcl-2.6.0-test5-bk3-15/arch/i386/mm/init.c pgcl-2.6.0-test5-bk3-16/arch/i386/mm/init.c --- pgcl-2.6.0-test5-bk3-15/arch/i386/mm/init.c 2003-11-27 09:51:26.000000000 -0800 +++ pgcl-2.6.0-test5-bk3-16/arch/i386/mm/init.c 2003-11-27 13:45:37.000000000 -0800 @@ -179,16 +179,13 @@ static inline int page_kills_ppro(unsign static inline int page_is_ram(unsigned long pagenr) { - int i, noise = 0; + int i; unsigned long begin_pfn, end_pfn; /* check the whole range of pfn's spanned by the page */ begin_pfn = pagenr & ~(PAGE_MMUCOUNT - 1); end_pfn = begin_pfn + PAGE_MMUCOUNT - 1; - if (begin_pfn <= 0xffd38 && 0xffd38 < end_pfn) - noise = 1; - for (i = 0; i < e820.nr_map; i++) { unsigned long addr, end; @@ -202,15 +199,9 @@ static inline int page_is_ram(unsigned l addr = MMUPAGE_ALIGN(e820.map[i].addr)/MMUPAGE_SIZE; end = (e820.map[i].addr + e820.map[i].size)/MMUPAGE_SIZE; if (begin_pfn >= addr && end_pfn < end) { - if (noise) { - printk("thought the bad page was good!!!\n"); - printk("addr = 0x%lx, end = 0x%lx\n",addr,end); - } return 1; } } - if (noise) - printk("properly skipped the bad page\n"); return 0; } diff -prauN pgcl-2.6.0-test5-bk3-15/fs/binfmt_elf.c pgcl-2.6.0-test5-bk3-16/fs/binfmt_elf.c --- pgcl-2.6.0-test5-bk3-15/fs/binfmt_elf.c 2003-11-27 06:53:03.000000000 -0800 +++ pgcl-2.6.0-test5-bk3-16/fs/binfmt_elf.c 2003-11-27 13:45:57.000000000 -0800 @@ -9,8 +9,6 @@ * Copyright 1993, 1994: Eric Youngdale (ericy@cais.com). */ -#define DEBUG - #include #include #include diff -prauN pgcl-2.6.0-test5-bk3-15/fs/exec.c pgcl-2.6.0-test5-bk3-16/fs/exec.c --- pgcl-2.6.0-test5-bk3-15/fs/exec.c 2003-11-27 06:15:17.000000000 -0800 +++ pgcl-2.6.0-test5-bk3-16/fs/exec.c 2003-11-27 13:46:11.000000000 -0800 @@ -22,8 +22,6 @@ * formats. */ -#define DEBUG - #include #include #include diff -prauN pgcl-2.6.0-test5-bk3-15/include/linux/folio.h pgcl-2.6.0-test5-bk3-16/include/linux/folio.h --- pgcl-2.6.0-test5-bk3-15/include/linux/folio.h 2003-11-27 11:37:16.000000000 -0800 +++ pgcl-2.6.0-test5-bk3-16/include/linux/folio.h 2003-11-27 13:48:42.000000000 -0800 @@ -18,10 +18,7 @@ #if PAGE_MMUSHIFT -#include - -#define bad_paddr_check(__paddr__) \ - BUG_ON(__paddr__/PAGE_SIZE == 0xffd38/PAGE_MMUCOUNT); +#define bad_paddr_check(__paddr__) do { } while (0) /* * Test whether pte2 indicates the same page as pte1. @@ -245,23 +242,6 @@ static struct page *private_folio_page(p pr_debug("%d: starting fcount = %d\n", current->pid, fcount); while (j < fcount) { pr_debug("%d: folio[%d] = %p\n", current->pid, j, folio[j]); - if (folio[j]) { - pgd_t *pgd; - pmd_t *pmd; - pgd = pgd_offset_k((u32)folio[j]); - pmd = pmd_offset(pgd, (u32)folio[j]); - -#define pmd_pfn(pmd) ({ (unsigned long)(pmd_val(pmd)/MMUPAGE_SIZE); }) - - if (pmd_pfn(*pmd) >= max_low_pfn) - pr_debug("%d: pmd pfn 0x%lx >= 0x%lx\n", - current->pid,pmd_pfn(*pmd),max_low_pfn); - else { - pte_t*pte=pte_offset_kernel(pmd,(u32)folio[j]); - pr_debug("%d: folio[%d] maps pfn 0x%lx\n", - current->pid, j, pte_pfn(*pte)); - } - } if (!folio[j] || !pte_present(*folio[j])) { pr_debug("%d: skipping folio[%d] = %p (0x%Lx), " "presence = %d\n", diff -prauN pgcl-2.6.0-test5-bk3-15/mm/page_alloc.c pgcl-2.6.0-test5-bk3-16/mm/page_alloc.c --- pgcl-2.6.0-test5-bk3-15/mm/page_alloc.c 2003-11-27 10:15:50.000000000 -0800 +++ pgcl-2.6.0-test5-bk3-16/mm/page_alloc.c 2003-11-27 13:49:01.000000000 -0800 @@ -221,11 +221,6 @@ static inline void free_pages_check(cons { int bad = 0; - if (page_to_pfn(page)/PAGE_MMUCOUNT == 0xffd38/PAGE_MMUCOUNT) { - printk("magically bad page\n"); - bad = 1; - } - if (unlikely(PageDirect(page))) { printk("PageDirect(page)\n"); bad = 1; @@ -387,9 +382,6 @@ static void prep_new_page(struct page *p 1 << PG_writeback ))) bad_page(__FUNCTION__, page); - if (page_to_pfn(page)/PAGE_MMUCOUNT == 0xffd38/PAGE_MMUCOUNT) - bad_page(__FUNCTION__, page); - page->flags &= ~( 1<< PG_uptodate | 1 << PG_error | 1 << PG_referenced | 1 << PG_arch_1 | diff -prauN pgcl-2.6.0-test5-bk3-15/mm/rmap.c pgcl-2.6.0-test5-bk3-16/mm/rmap.c --- pgcl-2.6.0-test5-bk3-15/mm/rmap.c 2003-11-27 13:17:19.000000000 -0800 +++ pgcl-2.6.0-test5-bk3-16/mm/rmap.c 2003-11-27 13:49:39.000000000 -0800 @@ -369,11 +369,6 @@ struct pte_chain *rmap_add_folio(struct for (k = 0; k < PAGE_MMUCOUNT; ++k) { if (!folio[k]) continue; - else { - pte_t *pte = rmap_ptep_map(folio[k]); - BUG_ON(pte_page(*pte) != page); - rmap_ptep_unmap(pte); - } /* * I'd like to BUG_ON(!pte_chain) here, but we can * consume the goddamn thing in __page_add_rmap()