diff for duplicates of <20040415071728.GE25560@zax> diff --git a/a/1.txt b/N1/1.txt index b27ff15..806d12c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -32,7 +32,8 @@ which just kills off follow_hugetlb_page() is safe, or have I missed something? Index: working-2.6/mm/memory.c -=================================--- working-2.6.orig/mm/memory.c 2004-04-13 11:42:42.000000000 +1000 +=================================================================== +--- working-2.6.orig/mm/memory.c 2004-04-13 11:42:42.000000000 +1000 +++ working-2.6/mm/memory.c 2004-04-15 17:03:01.421905400 +1000 @@ -766,16 +766,13 @@ || !(flags & vma->vm_flags)) @@ -54,7 +55,8 @@ Index: working-2.6/mm/memory.c * Shortcut for anonymous pages. We don't want * to force the creation of pages tables for Index: working-2.6/include/linux/hugetlb.h -=================================--- working-2.6.orig/include/linux/hugetlb.h 2004-04-13 11:42:41.000000000 +1000 +=================================================================== +--- working-2.6.orig/include/linux/hugetlb.h 2004-04-13 11:42:41.000000000 +1000 +++ working-2.6/include/linux/hugetlb.h 2004-04-15 17:03:22.847834536 +1000 @@ -12,7 +12,6 @@ @@ -73,7 +75,8 @@ Index: working-2.6/include/linux/hugetlb.h #define copy_hugetlb_page_range(src, dst, vma) ({ BUG(); 0; }) #define hugetlb_prefault(mapping, vma) ({ BUG(); 0; }) Index: working-2.6/arch/ppc64/mm/hugetlbpage.c -=================================--- working-2.6.orig/arch/ppc64/mm/hugetlbpage.c 2004-04-13 11:42:35.000000000 +1000 +=================================================================== +--- working-2.6.orig/arch/ppc64/mm/hugetlbpage.c 2004-04-13 11:42:35.000000000 +1000 +++ working-2.6/arch/ppc64/mm/hugetlbpage.c 2004-04-15 17:03:43.052825264 +1000 @@ -288,52 +288,6 @@ return 0; @@ -129,7 +132,8 @@ Index: working-2.6/arch/ppc64/mm/hugetlbpage.c follow_huge_addr(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long address, int write) Index: working-2.6/arch/i386/mm/hugetlbpage.c -=================================--- working-2.6.orig/arch/i386/mm/hugetlbpage.c 2004-04-13 11:42:35.000000000 +1000 +=================================================================== +--- working-2.6.orig/arch/i386/mm/hugetlbpage.c 2004-04-13 11:42:35.000000000 +1000 +++ working-2.6/arch/i386/mm/hugetlbpage.c 2004-04-15 17:07:42.813857792 +1000 @@ -93,65 +93,26 @@ return -ENOMEM; @@ -193,7 +197,7 @@ Index: working-2.6/arch/i386/mm/hugetlbpage.c + pte_t *pte; - nr = follow_hugetlb_page(mm, vma, &page, NULL, &start, &length, 0); -- if (nr = 1) +- if (nr == 1) - return page; - return NULL; + pte = huge_pte_offset(mm, address); @@ -211,7 +215,8 @@ Index: working-2.6/arch/i386/mm/hugetlbpage.c /* Index: working-2.6/arch/sparc64/mm/hugetlbpage.c -=================================--- working-2.6.orig/arch/sparc64/mm/hugetlbpage.c 2004-04-13 11:42:35.000000000 +1000 +=================================================================== +--- working-2.6.orig/arch/sparc64/mm/hugetlbpage.c 2004-04-13 11:42:35.000000000 +1000 +++ working-2.6/arch/sparc64/mm/hugetlbpage.c 2004-04-15 17:08:08.815900136 +1000 @@ -121,47 +121,6 @@ return -ENOMEM; @@ -262,7 +267,8 @@ Index: working-2.6/arch/sparc64/mm/hugetlbpage.c struct vm_area_struct *vma, unsigned long address, int write) Index: working-2.6/arch/ia64/mm/hugetlbpage.c -=================================--- working-2.6.orig/arch/ia64/mm/hugetlbpage.c 2004-04-14 12:22:48.000000000 +1000 +=================================================================== +--- working-2.6.orig/arch/ia64/mm/hugetlbpage.c 2004-04-14 12:22:48.000000000 +1000 +++ working-2.6/arch/ia64/mm/hugetlbpage.c 2004-04-15 17:08:30.667905672 +1000 @@ -113,43 +113,6 @@ return -ENOMEM; @@ -296,7 +302,7 @@ Index: working-2.6/arch/ia64/mm/hugetlbpage.c - i++; - len--; - start += PAGE_SIZE; -- if (((start & HPAGE_MASK) = pstart) && len && +- if (((start & HPAGE_MASK) == pstart) && len && - (start < vma->vm_end)) - goto back1; - } while (len && start < vma->vm_end); @@ -309,7 +315,8 @@ Index: working-2.6/arch/ia64/mm/hugetlbpage.c { if (mm->used_hugetlb) { Index: working-2.6/arch/sh/mm/hugetlbpage.c -=================================--- working-2.6.orig/arch/sh/mm/hugetlbpage.c 2004-04-13 11:42:35.000000000 +1000 +=================================================================== +--- working-2.6.orig/arch/sh/mm/hugetlbpage.c 2004-04-13 11:42:35.000000000 +1000 +++ working-2.6/arch/sh/mm/hugetlbpage.c 2004-04-15 17:08:49.216881808 +1000 @@ -124,47 +124,6 @@ return -ENOMEM; diff --git a/a/content_digest b/N1/content_digest index 0ec7071..06580d7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0200404132322.i3DNMuF21215@unix-os.sc.intel.com\0" "From\0David Gibson <david@gibson.dropbear.id.au>\0" "Subject\0Re: hugetlb demand paging patch part [2/3]\0" - "Date\0Thu, 15 Apr 2004 07:17:28 +0000\0" + "Date\0Thu, 15 Apr 2004 17:17:28 +1000\0" "To\0Chen" " Kenneth W <kenneth.w.chen@intel.com>\0" "Cc\0linux-kernel@vger.kernel.org" @@ -46,7 +46,8 @@ "something?\n" "\n" "Index: working-2.6/mm/memory.c\n" - "=================================--- working-2.6.orig/mm/memory.c\t2004-04-13 11:42:42.000000000 +1000\n" + "===================================================================\n" + "--- working-2.6.orig/mm/memory.c\t2004-04-13 11:42:42.000000000 +1000\n" "+++ working-2.6/mm/memory.c\t2004-04-15 17:03:01.421905400 +1000\n" "@@ -766,16 +766,13 @@\n" " \t\t\t\t|| !(flags & vma->vm_flags))\n" @@ -68,7 +69,8 @@ " \t\t\t\t * Shortcut for anonymous pages. We don't want\n" " \t\t\t\t * to force the creation of pages tables for\n" "Index: working-2.6/include/linux/hugetlb.h\n" - "=================================--- working-2.6.orig/include/linux/hugetlb.h\t2004-04-13 11:42:41.000000000 +1000\n" + "===================================================================\n" + "--- working-2.6.orig/include/linux/hugetlb.h\t2004-04-13 11:42:41.000000000 +1000\n" "+++ working-2.6/include/linux/hugetlb.h\t2004-04-15 17:03:22.847834536 +1000\n" "@@ -12,7 +12,6 @@\n" " \n" @@ -87,7 +89,8 @@ " #define copy_hugetlb_page_range(src, dst, vma)\t({ BUG(); 0; })\n" " #define hugetlb_prefault(mapping, vma)\t\t({ BUG(); 0; })\n" "Index: working-2.6/arch/ppc64/mm/hugetlbpage.c\n" - "=================================--- working-2.6.orig/arch/ppc64/mm/hugetlbpage.c\t2004-04-13 11:42:35.000000000 +1000\n" + "===================================================================\n" + "--- working-2.6.orig/arch/ppc64/mm/hugetlbpage.c\t2004-04-13 11:42:35.000000000 +1000\n" "+++ working-2.6/arch/ppc64/mm/hugetlbpage.c\t2004-04-15 17:03:43.052825264 +1000\n" "@@ -288,52 +288,6 @@\n" " \treturn 0;\n" @@ -143,7 +146,8 @@ " follow_huge_addr(struct mm_struct *mm,\n" " \tstruct vm_area_struct *vma, unsigned long address, int write)\n" "Index: working-2.6/arch/i386/mm/hugetlbpage.c\n" - "=================================--- working-2.6.orig/arch/i386/mm/hugetlbpage.c\t2004-04-13 11:42:35.000000000 +1000\n" + "===================================================================\n" + "--- working-2.6.orig/arch/i386/mm/hugetlbpage.c\t2004-04-13 11:42:35.000000000 +1000\n" "+++ working-2.6/arch/i386/mm/hugetlbpage.c\t2004-04-15 17:07:42.813857792 +1000\n" "@@ -93,65 +93,26 @@\n" " \treturn -ENOMEM;\n" @@ -207,7 +211,7 @@ "+\tpte_t *pte;\n" " \n" "-\tnr = follow_hugetlb_page(mm, vma, &page, NULL, &start, &length, 0);\n" - "-\tif (nr = 1)\n" + "-\tif (nr == 1)\n" "-\t\treturn page;\n" "-\treturn NULL;\n" "+\tpte = huge_pte_offset(mm, address);\n" @@ -225,7 +229,8 @@ " \n" " /*\n" "Index: working-2.6/arch/sparc64/mm/hugetlbpage.c\n" - "=================================--- working-2.6.orig/arch/sparc64/mm/hugetlbpage.c\t2004-04-13 11:42:35.000000000 +1000\n" + "===================================================================\n" + "--- working-2.6.orig/arch/sparc64/mm/hugetlbpage.c\t2004-04-13 11:42:35.000000000 +1000\n" "+++ working-2.6/arch/sparc64/mm/hugetlbpage.c\t2004-04-15 17:08:08.815900136 +1000\n" "@@ -121,47 +121,6 @@\n" " \treturn -ENOMEM;\n" @@ -276,7 +281,8 @@ " \t\t\t struct vm_area_struct *vma,\n" " \t\t\t unsigned long address, int write)\n" "Index: working-2.6/arch/ia64/mm/hugetlbpage.c\n" - "=================================--- working-2.6.orig/arch/ia64/mm/hugetlbpage.c\t2004-04-14 12:22:48.000000000 +1000\n" + "===================================================================\n" + "--- working-2.6.orig/arch/ia64/mm/hugetlbpage.c\t2004-04-14 12:22:48.000000000 +1000\n" "+++ working-2.6/arch/ia64/mm/hugetlbpage.c\t2004-04-15 17:08:30.667905672 +1000\n" "@@ -113,43 +113,6 @@\n" " \treturn -ENOMEM;\n" @@ -310,7 +316,7 @@ "-\t\ti++;\n" "-\t\tlen--;\n" "-\t\tstart += PAGE_SIZE;\n" - "-\t\tif (((start & HPAGE_MASK) = pstart) && len &&\n" + "-\t\tif (((start & HPAGE_MASK) == pstart) && len &&\n" "-\t\t\t\t(start < vma->vm_end))\n" "-\t\t\tgoto back1;\n" "-\t} while (len && start < vma->vm_end);\n" @@ -323,7 +329,8 @@ " {\n" " \tif (mm->used_hugetlb) {\n" "Index: working-2.6/arch/sh/mm/hugetlbpage.c\n" - "=================================--- working-2.6.orig/arch/sh/mm/hugetlbpage.c\t2004-04-13 11:42:35.000000000 +1000\n" + "===================================================================\n" + "--- working-2.6.orig/arch/sh/mm/hugetlbpage.c\t2004-04-13 11:42:35.000000000 +1000\n" "+++ working-2.6/arch/sh/mm/hugetlbpage.c\t2004-04-15 17:08:49.216881808 +1000\n" "@@ -124,47 +124,6 @@\n" " \treturn -ENOMEM;\n" @@ -381,4 +388,4 @@ "\t\t\t\t| wrong.\n" http://www.ozlabs.org/people/dgibson -f0d6b3d2aefaa58f5d7034ab891337f3a6bcc3571d43e3ad1c544221141d4be7 +62d37e11efb1bc5574cbb961f8f4045c5b414879ed5d5ae280a98bc124d7b071
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.