diff for duplicates of <20060302045201.GA6627@localhost.localdomain> diff --git a/a/1.txt b/N1/1.txt index efd6b7b..5df1df1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -34,7 +34,8 @@ POWER5 (8-way), ppc64 G5 (2-way) and i386 Pentium M (UP). Signed-off-by: David Gibson <dwg@au1.ibm.com> Index: working-2.6/mm/memory.c -=================================--- working-2.6.orig/mm/memory.c 2006-02-24 11:44:36.000000000 +1100 +=================================================================== +--- working-2.6.orig/mm/memory.c 2006-02-24 11:44:36.000000000 +1100 +++ working-2.6/mm/memory.c 2006-03-02 11:14:03.000000000 +1100 @@ -277,7 +277,7 @@ void free_pgtables(struct mmu_gather **t anon_vma_unlink(vma); @@ -56,7 +57,8 @@ Index: working-2.6/mm/memory.c next = vma->vm_next; anon_vma_unlink(vma); Index: working-2.6/include/asm-ia64/page.h -=================================--- working-2.6.orig/include/asm-ia64/page.h 2006-03-02 11:12:40.000000000 +1100 +=================================================================== +--- working-2.6.orig/include/asm-ia64/page.h 2006-03-02 11:12:40.000000000 +1100 +++ working-2.6/include/asm-ia64/page.h 2006-03-02 11:30:26.000000000 +1100 @@ -57,6 +57,7 @@ @@ -67,7 +69,8 @@ Index: working-2.6/include/asm-ia64/page.h #ifdef __ASSEMBLY__ Index: working-2.6/include/asm-powerpc/pgtable.h -=================================--- working-2.6.orig/include/asm-powerpc/pgtable.h 2006-02-24 11:44:35.000000000 +1100 +=================================================================== +--- working-2.6.orig/include/asm-powerpc/pgtable.h 2006-02-24 11:44:35.000000000 +1100 +++ working-2.6/include/asm-powerpc/pgtable.h 2006-03-02 11:29:26.000000000 +1100 @@ -468,11 +468,6 @@ extern pgd_t swapper_pg_dir[]; @@ -82,7 +85,8 @@ Index: working-2.6/include/asm-powerpc/pgtable.h * This gets called at the end of handling a page fault, when * the kernel has put a new PTE into the page table for the process. Index: working-2.6/include/linux/hugetlb.h -=================================--- working-2.6.orig/include/linux/hugetlb.h 2006-03-02 11:12:40.000000000 +1100 +=================================================================== +--- working-2.6.orig/include/linux/hugetlb.h 2006-03-02 11:12:40.000000000 +1100 +++ working-2.6/include/linux/hugetlb.h 2006-03-02 11:47:30.000000000 +1100 @@ -43,8 +43,10 @@ void hugetlb_change_protection(struct vm diff --git a/a/content_digest b/N1/content_digest index 5d89694..d61751a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0'David Gibson' <david@gibson.dropbear.id.au>\0" "Subject\0hugepage: Fix hugepage logic in free_pgtables()\0" - "Date\0Thu, 02 Mar 2006 04:52:01 +0000\0" + "Date\0Thu, 2 Mar 2006 15:52:01 +1100\0" "To\0Andrew Morton <akpm@osdl.org>\0" "Cc\0Hugh Dickins <hugh@veritas.com>" Chen @@ -45,7 +45,8 @@ "Signed-off-by: David Gibson <dwg@au1.ibm.com>\n" "\n" "Index: working-2.6/mm/memory.c\n" - "=================================--- working-2.6.orig/mm/memory.c\t2006-02-24 11:44:36.000000000 +1100\n" + "===================================================================\n" + "--- working-2.6.orig/mm/memory.c\t2006-02-24 11:44:36.000000000 +1100\n" "+++ working-2.6/mm/memory.c\t2006-03-02 11:14:03.000000000 +1100\n" "@@ -277,7 +277,7 @@ void free_pgtables(struct mmu_gather **t\n" " \t\tanon_vma_unlink(vma);\n" @@ -67,7 +68,8 @@ " \t\t\t\tnext = vma->vm_next;\n" " \t\t\t\tanon_vma_unlink(vma);\n" "Index: working-2.6/include/asm-ia64/page.h\n" - "=================================--- working-2.6.orig/include/asm-ia64/page.h\t2006-03-02 11:12:40.000000000 +1100\n" + "===================================================================\n" + "--- working-2.6.orig/include/asm-ia64/page.h\t2006-03-02 11:12:40.000000000 +1100\n" "+++ working-2.6/include/asm-ia64/page.h\t2006-03-02 11:30:26.000000000 +1100\n" "@@ -57,6 +57,7 @@\n" " \n" @@ -78,7 +80,8 @@ " \n" " #ifdef __ASSEMBLY__\n" "Index: working-2.6/include/asm-powerpc/pgtable.h\n" - "=================================--- working-2.6.orig/include/asm-powerpc/pgtable.h\t2006-02-24 11:44:35.000000000 +1100\n" + "===================================================================\n" + "--- working-2.6.orig/include/asm-powerpc/pgtable.h\t2006-02-24 11:44:35.000000000 +1100\n" "+++ working-2.6/include/asm-powerpc/pgtable.h\t2006-03-02 11:29:26.000000000 +1100\n" "@@ -468,11 +468,6 @@ extern pgd_t swapper_pg_dir[];\n" " \n" @@ -93,7 +96,8 @@ " * This gets called at the end of handling a page fault, when\n" " * the kernel has put a new PTE into the page table for the process.\n" "Index: working-2.6/include/linux/hugetlb.h\n" - "=================================--- working-2.6.orig/include/linux/hugetlb.h\t2006-03-02 11:12:40.000000000 +1100\n" + "===================================================================\n" + "--- working-2.6.orig/include/linux/hugetlb.h\t2006-03-02 11:12:40.000000000 +1100\n" "+++ working-2.6/include/linux/hugetlb.h\t2006-03-02 11:47:30.000000000 +1100\n" "@@ -43,8 +43,10 @@ void hugetlb_change_protection(struct vm\n" " \n" @@ -125,4 +129,4 @@ "\t\t\t\t| _way_ _around_!\n" http://www.ozlabs.org/~dgibson -401419e01f3e0dd57ced304262b118dc9577314557b8ad6419a7844e09b0eda3 +f756c7d6c4f8679dc2ae8d7655d0f9186dc80f1848ae5f114dab3aa9b1d5858a
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.