diff for duplicates of <20040416023442.GF12735@zax> diff --git a/a/1.txt b/N1/1.txt index 6854b7d..c4540e6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -37,7 +37,8 @@ cleanups from new features in your patches. > > something? > > > > Index: working-2.6/mm/memory.c -> > =================================> > +++ working-2.6/mm/memory.c 2004-04-15 17:03:01.421905400 +1000 +> > =================================================================== +> > +++ working-2.6/mm/memory.c 2004-04-15 17:03:01.421905400 +1000 > > @@ -766,16 +766,13 @@ > > [snip] > > spin_lock(&mm->page_table_lock); @@ -71,7 +72,8 @@ Yes, I looked at it already. But what I'm asking about is applying this patch *without* (or before) going to demand paging. 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-16 11:46:31.935870496 +1000 @@ -766,16 +766,13 @@ || !(flags & vma->vm_flags)) @@ -93,7 +95,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-16 11:46:31.947868672 +1000 @@ -12,7 +12,6 @@ @@ -112,7 +115,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-16 11:46:31.950868216 +1000 @@ -288,52 +288,6 @@ return 0; @@ -168,7 +172,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-16 11:49:11.914912248 +1000 @@ -93,65 +93,27 @@ return -ENOMEM; @@ -232,7 +237,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); @@ -251,7 +256,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-16 11:46:31.961866544 +1000 @@ -121,47 +121,6 @@ return -ENOMEM; @@ -302,7 +308,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-16 11:46:31.963866240 +1000 @@ -113,43 +113,6 @@ return -ENOMEM; @@ -336,7 +343,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); @@ -349,7 +356,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-16 11:46:31.971865024 +1000 @@ -124,47 +124,6 @@ return -ENOMEM; diff --git a/a/content_digest b/N1/content_digest index 4d62543..0aa3506 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\0200404151727.i3FHRwF08564@unix-os.sc.intel.com\0" "From\0'David Gibson' <david@gibson.dropbear.id.au>\0" "Subject\0Re: hugetlb demand paging patch part [2/3]\0" - "Date\0Fri, 16 Apr 2004 02:34:42 +0000\0" + "Date\0Fri, 16 Apr 2004 12:34:42 +1000\0" "To\0Chen" " Kenneth W <kenneth.w.chen@intel.com>\0" "Cc\0linux-kernel@vger.kernel.org" @@ -52,7 +52,8 @@ "> > something?\n" "> >\n" "> > Index: working-2.6/mm/memory.c\n" - "> > =================================> > +++ working-2.6/mm/memory.c\t2004-04-15 17:03:01.421905400 +1000\n" + "> > ===================================================================\n" + "> > +++ working-2.6/mm/memory.c\t2004-04-15 17:03:01.421905400 +1000\n" "> > @@ -766,16 +766,13 @@\n" "> > [snip]\n" "> > \t\tspin_lock(&mm->page_table_lock);\n" @@ -86,7 +87,8 @@ "this patch *without* (or before) going to demand paging.\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-16 11:46:31.935870496 +1000\n" "@@ -766,16 +766,13 @@\n" " \t\t\t\t|| !(flags & vma->vm_flags))\n" @@ -108,7 +110,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-16 11:46:31.947868672 +1000\n" "@@ -12,7 +12,6 @@\n" " \n" @@ -127,7 +130,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-16 11:46:31.950868216 +1000\n" "@@ -288,52 +288,6 @@\n" " \treturn 0;\n" @@ -183,7 +187,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-16 11:49:11.914912248 +1000\n" "@@ -93,65 +93,27 @@\n" " \treturn -ENOMEM;\n" @@ -247,7 +252,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" @@ -266,7 +271,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-16 11:46:31.961866544 +1000\n" "@@ -121,47 +121,6 @@\n" " \treturn -ENOMEM;\n" @@ -317,7 +323,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-16 11:46:31.963866240 +1000\n" "@@ -113,43 +113,6 @@\n" " \treturn -ENOMEM;\n" @@ -351,7 +358,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" @@ -364,7 +371,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-16 11:46:31.971865024 +1000\n" "@@ -124,47 +124,6 @@\n" " \treturn -ENOMEM;\n" @@ -421,4 +429,4 @@ "\t\t\t\t| wrong.\n" http://www.ozlabs.org/people/dgibson -cf340fb980f8bc46513b580f12182b57b626d74e6ea4b72d7b5e4fd0b86d6b7a +6b2b32e94d8ea0c0031e609a671a74909860001169a5047ac8bbe51bf3e02881
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.