diff for duplicates of <1144976261.5817.114.camel@linux-znh> diff --git a/a/1.txt b/N1/1.txt index c3695b0..9beb8e2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -34,7 +34,7 @@ diff -Nraup a/mm/hugetlb.c b/mm/hugetlb.c - unsigned long i, j; - -#ifndef ARCH_HAS_VARIABLE_HUGEPAGE_SIZE -- if (HPAGE_SHIFT(0) = 0) +- if (HPAGE_SHIFT(0) == 0) - return 0; -#endif - @@ -46,7 +46,8 @@ diff -Nraup a/mm/hugetlb.c b/mm/hugetlb.c - if (!alloc_fresh_huge_page(HUGETLB_INIT_PAGE_ORDER)) - break; - } -- max_huge_pages = free_huge_pages[HUGETLB_INIT_PAGE_ORDER] nr_huge_pages[HUGETLB_INIT_PAGE_ORDER] = i; +- max_huge_pages = free_huge_pages[HUGETLB_INIT_PAGE_ORDER] = +nr_huge_pages[HUGETLB_INIT_PAGE_ORDER] = i; - printk("Total HugeTLB memory allocated, %ld\n", - free_huge_pages[HUGETLB_INIT_PAGE_ORDER]); - return 0; @@ -146,7 +147,7 @@ diff -Nraup a/mm/hugetlb.c b/mm/hugetlb.c + struct proc_dir_entry *pde; + +#ifndef ARCH_HAS_VARIABLE_HUGEPAGE_SIZE -+ if (HPAGE_SHIFT(0) = 0) ++ if (HPAGE_SHIFT(0) == 0) + return 0; +#endif + @@ -158,7 +159,8 @@ diff -Nraup a/mm/hugetlb.c b/mm/hugetlb.c + if (!alloc_fresh_huge_page(HUGETLB_INIT_PAGE_ORDER)) + break; + } -+ max_huge_pages = free_huge_pages[HUGETLB_INIT_PAGE_ORDER] nr_huge_pages[HUGETLB_INIT_PAGE_ORDER] = i; ++ max_huge_pages = free_huge_pages[HUGETLB_INIT_PAGE_ORDER] = +nr_huge_pages[HUGETLB_INIT_PAGE_ORDER] = i; + printk("Total HugeTLB memory allocated, %ld\n", + free_huge_pages[HUGETLB_INIT_PAGE_ORDER]); + diff --git a/a/content_digest b/N1/content_digest index 9f8c45a..4b5f3ba 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,8 +6,8 @@ "ref\01144975746.5817.94.camel@linux-znh\0" "ref\01144975953.5817.102.camel@linux-znh\0" "From\0Zou Nan hai <nanhai.zou@intel.com>\0" - "Subject\0Re: [PATCH 7/8] IA64 various hugepage size - Add proc control to\0" - "Date\0Fri, 14 Apr 2006 00:57:41 +0000\0" + "Subject\0Re: [PATCH 7/8] IA64 various hugepage size - Add proc control to reserve and free\0" + "Date\014 Apr 2006 08:57:41 +0800\0" "To\0LKML <linux-kernel@vger.kernel.org>\0" "Cc\0Linux-IA64 <linux-ia64@vger.kernel.org>" Tony <tony.luck@intel.com> @@ -50,7 +50,7 @@ "-\tunsigned long i, j;\n" "-\n" "-#ifndef ARCH_HAS_VARIABLE_HUGEPAGE_SIZE\n" - "-\tif (HPAGE_SHIFT(0) = 0)\n" + "-\tif (HPAGE_SHIFT(0) == 0)\n" "-\t\treturn 0;\n" "-#endif\n" "-\n" @@ -62,7 +62,8 @@ "-\t\tif (!alloc_fresh_huge_page(HUGETLB_INIT_PAGE_ORDER))\n" "-\t\t\tbreak;\n" "-\t}\n" - "-\tmax_huge_pages = free_huge_pages[HUGETLB_INIT_PAGE_ORDER] nr_huge_pages[HUGETLB_INIT_PAGE_ORDER] = i;\n" + "-\tmax_huge_pages = free_huge_pages[HUGETLB_INIT_PAGE_ORDER] =\n" + "nr_huge_pages[HUGETLB_INIT_PAGE_ORDER] = i;\n" "-\tprintk(\"Total HugeTLB memory allocated, %ld\\n\", \n" "-\t\tfree_huge_pages[HUGETLB_INIT_PAGE_ORDER]);\n" "-\treturn 0;\n" @@ -162,7 +163,7 @@ "+\tstruct proc_dir_entry *pde;\n" "+\n" "+#ifndef ARCH_HAS_VARIABLE_HUGEPAGE_SIZE\n" - "+\tif (HPAGE_SHIFT(0) = 0)\n" + "+\tif (HPAGE_SHIFT(0) == 0)\n" "+\t\treturn 0;\n" "+#endif\n" "+\n" @@ -174,7 +175,8 @@ "+\t\tif (!alloc_fresh_huge_page(HUGETLB_INIT_PAGE_ORDER))\n" "+\t\t\tbreak;\n" "+\t}\n" - "+\tmax_huge_pages = free_huge_pages[HUGETLB_INIT_PAGE_ORDER] nr_huge_pages[HUGETLB_INIT_PAGE_ORDER] = i;\n" + "+\tmax_huge_pages = free_huge_pages[HUGETLB_INIT_PAGE_ORDER] =\n" + "nr_huge_pages[HUGETLB_INIT_PAGE_ORDER] = i;\n" "+\tprintk(\"Total HugeTLB memory allocated, %ld\\n\",\n" "+\t\tfree_huge_pages[HUGETLB_INIT_PAGE_ORDER]);\n" "+\n" @@ -203,4 +205,4 @@ " {\n" " \treturn sprintf(buf," -9380ff16a4a9651b65e42e6f30b6bfac78647f4cdc6437c87c60b9da8eb734f9 +1ce16203d5a381ce142e73b3d7816176433ec6c67ade2b738aa04cad349e7422
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.