diff for duplicates of <1144975953.5817.102.camel@linux-znh> diff --git a/a/1.txt b/N1/1.txt index ee98afb..cadd1c4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,7 +18,7 @@ diff -Nraup a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c + if (!is_valid_hpage_size(size)) + return -EINVAL; + shift = __ffs(size); -+ if (shift = mm->hugepage_shift) ++ if (shift == mm->hugepage_shift) + return 0; + down_write(&mm->mmap_sem); + for (vma = mm->mmap; vma ; vma = vma->vm_next) { @@ -36,8 +36,8 @@ diff -Nraup a/include/asm-ia64/page.h b/include/asm-ia64/page.h --- a/include/asm-ia64/page.h 2006-04-13 08:41:37.000000000 +0800 +++ b/include/asm-ia64/page.h 2006-04-13 08:30:21.000000000 +0800 @@ -166,6 +166,8 @@ typedef union ia64_va { - (REGION_NUMBER(addr) = RGN_HPAGE || \ - REGION_NUMBER((addr)+(len)-1) = RGN_HPAGE) + (REGION_NUMBER(addr) == RGN_HPAGE || \ + REGION_NUMBER((addr)+(len)-1) == RGN_HPAGE) extern unsigned int init_hpage_shift; +struct task_struct; +extern int set_hugepagesize(struct task_struct *,unsigned long); diff --git a/a/content_digest b/N1/content_digest index d0d0c84..590cd49 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,8 +5,8 @@ "ref\01144975523.5817.84.camel@linux-znh\0" "ref\01144975746.5817.94.camel@linux-znh\0" "From\0Zou Nan hai <nanhai.zou@intel.com>\0" - "Subject\0Re: [PATCH 6/8] IA64 various hugepage size - introduce prctl\0" - "Date\0Fri, 14 Apr 2006 00:52:33 +0000\0" + "Subject\0Re: [PATCH 6/8] IA64 various hugepage size - introduce prctl options to set/get hugepage size\0" + "Date\014 Apr 2006 08:52:33 +0800\0" "To\0LKML <linux-kernel@vger.kernel.org>\0" "Cc\0Linux-IA64 <linux-ia64@vger.kernel.org>" Tony <tony.luck@intel.com> @@ -33,7 +33,7 @@ "+\tif (!is_valid_hpage_size(size))\n" "+\t\treturn -EINVAL;\n" "+\tshift = __ffs(size);\n" - "+\tif (shift = mm->hugepage_shift)\n" + "+\tif (shift == mm->hugepage_shift)\n" "+\t\treturn 0;\n" "+\tdown_write(&mm->mmap_sem);\n" "+\tfor (vma = mm->mmap; vma ; vma = vma->vm_next) {\n" @@ -51,8 +51,8 @@ "--- a/include/asm-ia64/page.h\t2006-04-13 08:41:37.000000000 +0800\n" "+++ b/include/asm-ia64/page.h\t2006-04-13 08:30:21.000000000 +0800\n" "@@ -166,6 +166,8 @@ typedef union ia64_va {\n" - " \t (REGION_NUMBER(addr) = RGN_HPAGE ||\t\\\n" - " \t REGION_NUMBER((addr)+(len)-1) = RGN_HPAGE)\n" + " \t (REGION_NUMBER(addr) == RGN_HPAGE ||\t\\\n" + " \t REGION_NUMBER((addr)+(len)-1) == RGN_HPAGE)\n" " extern unsigned int init_hpage_shift;\n" "+struct task_struct;\n" "+extern int set_hugepagesize(struct task_struct *,unsigned long);\n" @@ -119,4 +119,4 @@ " \t\t\terror = -EINVAL;\n" " \t\t\tbreak;" -b4b691df2eadee1c224b896462b332420acf49c56cf3a199fb80164ee5741081 +1dbf0eda84d677769b1cb145ac46148f09a89d2d9f7d27207b497d16d413df47
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.