diff for duplicates of <20060222232614.GA25108@localhost.localdomain> diff --git a/a/1.txt b/N1/1.txt index 7618528..0fd1b65 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,7 +24,8 @@ to be changed. I'm probably not the best person to do that, since I don't have an ia64 machine to test on. Index: working-2.6/mm/mremap.c -=================================--- working-2.6.orig/mm/mremap.c 2006-01-16 13:02:29.000000000 +1100 +=================================================================== +--- working-2.6.orig/mm/mremap.c 2006-01-16 13:02:29.000000000 +1100 +++ working-2.6/mm/mremap.c 2006-02-23 09:54:52.000000000 +1100 @@ -278,7 +278,7 @@ unsigned long do_mremap(unsigned long ad if (!(flags & MREMAP_MAYMOVE)) @@ -45,7 +46,8 @@ Index: working-2.6/mm/mremap.c max_addr = vma->vm_next->vm_start; /* can we just expand the current mapping? */ Index: working-2.6/mm/mmap.c -=================================--- working-2.6.orig/mm/mmap.c 2006-02-23 09:54:43.000000000 +1100 +=================================================================== +--- working-2.6.orig/mm/mmap.c 2006-02-23 09:54:43.000000000 +1100 +++ working-2.6/mm/mmap.c 2006-02-23 10:00:08.000000000 +1100 @@ -1345,7 +1345,7 @@ get_unmapped_area(struct file *file, uns return addr; @@ -64,7 +66,7 @@ Index: working-2.6/mm/mmap.c + if ((start & ~PAGE_MASK) || !GOOD_TASK_VM_RANGE(start, len)) return -EINVAL; - if ((len = PAGE_ALIGN(len)) = 0) + if ((len = PAGE_ALIGN(len)) == 0) @@ -1851,7 +1851,7 @@ unsigned long do_brk(unsigned long addr, if (!len) return addr; @@ -75,7 +77,8 @@ Index: working-2.6/mm/mmap.c /* Index: working-2.6/include/asm-ia64/page.h -=================================--- working-2.6.orig/include/asm-ia64/page.h 2006-01-16 13:02:29.000000000 +1100 +=================================================================== +--- working-2.6.orig/include/asm-ia64/page.h 2006-01-16 13:02:29.000000000 +1100 +++ working-2.6/include/asm-ia64/page.h 2006-02-23 09:54:52.000000000 +1100 @@ -142,6 +142,8 @@ typedef union ia64_va { #define REGION_NUMBER(x) ({ia64_va _v; _v.l = (long) (x); _v.f.reg;}) @@ -87,7 +90,8 @@ Index: working-2.6/include/asm-ia64/page.h # define htlbpage_to_page(x) (((unsigned long) REGION_NUMBER(x) << 61) \ | (REGION_OFFSET(x) >> (HPAGE_SHIFT-PAGE_SHIFT))) Index: working-2.6/include/linux/mm.h -=================================--- working-2.6.orig/include/linux/mm.h 2006-02-20 10:55:12.000000000 +1100 +=================================================================== +--- working-2.6.orig/include/linux/mm.h 2006-02-20 10:55:12.000000000 +1100 +++ working-2.6/include/linux/mm.h 2006-02-23 10:01:51.000000000 +1100 @@ -41,6 +41,13 @@ extern int sysctl_legacy_va_layout; @@ -104,7 +108,8 @@ Index: working-2.6/include/linux/mm.h * Linux kernel virtual memory manager primitives. * The idea being to have a "virtual" mm in the same way Index: working-2.6/fs/binfmt_elf.c -=================================--- working-2.6.orig/fs/binfmt_elf.c 2006-01-16 13:08:42.000000000 +1100 +=================================================================== +--- working-2.6.orig/fs/binfmt_elf.c 2006-01-16 13:08:42.000000000 +1100 +++ working-2.6/fs/binfmt_elf.c 2006-02-23 09:54:52.000000000 +1100 @@ -86,7 +86,8 @@ static struct linux_binfmt elf_format = .min_coredump = ELF_EXEC_PAGESIZE @@ -140,7 +145,8 @@ Index: working-2.6/fs/binfmt_elf.c send_sig(SIGKILL, current, 0); goto out_free_dentry; Index: working-2.6/arch/ia64/kernel/sys_ia64.c -=================================--- working-2.6.orig/arch/ia64/kernel/sys_ia64.c 2006-01-16 13:02:16.000000000 +1100 +=================================================================== +--- working-2.6.orig/arch/ia64/kernel/sys_ia64.c 2006-01-16 13:02:16.000000000 +1100 +++ working-2.6/arch/ia64/kernel/sys_ia64.c 2006-02-23 09:54:52.000000000 +1100 @@ -189,17 +189,6 @@ do_mmap2 (unsigned long addr, unsigned l goto out; diff --git a/a/content_digest b/N1/content_digest index d623bd2..10bf2c6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\0200602221619.k1MGJog18578@unix-os.sc.intel.com\0" "From\0'David Gibson' <david@gibson.dropbear.id.au>\0" "Subject\0Re: IA64 non-contiguous memory space bugs\0" - "Date\0Wed, 22 Feb 2006 23:26:14 +0000\0" + "Date\0Thu, 23 Feb 2006 10:26:14 +1100\0" "To\0Chen" " Kenneth W <kenneth.w.chen@intel.com>\0" "Cc\0linux-ia64@vger.kernel.org" @@ -35,7 +35,8 @@ "don't have an ia64 machine to test on.\n" "\n" "Index: working-2.6/mm/mremap.c\n" - "=================================--- working-2.6.orig/mm/mremap.c\t2006-01-16 13:02:29.000000000 +1100\n" + "===================================================================\n" + "--- working-2.6.orig/mm/mremap.c\t2006-01-16 13:02:29.000000000 +1100\n" "+++ working-2.6/mm/mremap.c\t2006-02-23 09:54:52.000000000 +1100\n" "@@ -278,7 +278,7 @@ unsigned long do_mremap(unsigned long ad\n" " \t\tif (!(flags & MREMAP_MAYMOVE))\n" @@ -56,7 +57,8 @@ " \t\t\tmax_addr = vma->vm_next->vm_start;\n" " \t\t/* can we just expand the current mapping? */\n" "Index: working-2.6/mm/mmap.c\n" - "=================================--- working-2.6.orig/mm/mmap.c\t2006-02-23 09:54:43.000000000 +1100\n" + "===================================================================\n" + "--- working-2.6.orig/mm/mmap.c\t2006-02-23 09:54:43.000000000 +1100\n" "+++ working-2.6/mm/mmap.c\t2006-02-23 10:00:08.000000000 +1100\n" "@@ -1345,7 +1345,7 @@ get_unmapped_area(struct file *file, uns\n" " \t\t\treturn addr;\n" @@ -75,7 +77,7 @@ "+\tif ((start & ~PAGE_MASK) || !GOOD_TASK_VM_RANGE(start, len))\n" " \t\treturn -EINVAL;\n" " \n" - " \tif ((len = PAGE_ALIGN(len)) = 0)\n" + " \tif ((len = PAGE_ALIGN(len)) == 0)\n" "@@ -1851,7 +1851,7 @@ unsigned long do_brk(unsigned long addr,\n" " \tif (!len)\n" " \t\treturn addr;\n" @@ -86,7 +88,8 @@ " \n" " \t/*\n" "Index: working-2.6/include/asm-ia64/page.h\n" - "=================================--- working-2.6.orig/include/asm-ia64/page.h\t2006-01-16 13:02:29.000000000 +1100\n" + "===================================================================\n" + "--- working-2.6.orig/include/asm-ia64/page.h\t2006-01-16 13:02:29.000000000 +1100\n" "+++ working-2.6/include/asm-ia64/page.h\t2006-02-23 09:54:52.000000000 +1100\n" "@@ -142,6 +142,8 @@ typedef union ia64_va {\n" " #define REGION_NUMBER(x)\t({ia64_va _v; _v.l = (long) (x); _v.f.reg;})\n" @@ -98,7 +101,8 @@ " # define htlbpage_to_page(x)\t(((unsigned long) REGION_NUMBER(x) << 61)\t\t\t\\\n" " \t\t\t\t | (REGION_OFFSET(x) >> (HPAGE_SHIFT-PAGE_SHIFT)))\n" "Index: working-2.6/include/linux/mm.h\n" - "=================================--- working-2.6.orig/include/linux/mm.h\t2006-02-20 10:55:12.000000000 +1100\n" + "===================================================================\n" + "--- working-2.6.orig/include/linux/mm.h\t2006-02-20 10:55:12.000000000 +1100\n" "+++ working-2.6/include/linux/mm.h\t2006-02-23 10:01:51.000000000 +1100\n" "@@ -41,6 +41,13 @@ extern int sysctl_legacy_va_layout;\n" " \n" @@ -115,7 +119,8 @@ " * Linux kernel virtual memory manager primitives.\n" " * The idea being to have a \"virtual\" mm in the same way\n" "Index: working-2.6/fs/binfmt_elf.c\n" - "=================================--- working-2.6.orig/fs/binfmt_elf.c\t2006-01-16 13:08:42.000000000 +1100\n" + "===================================================================\n" + "--- working-2.6.orig/fs/binfmt_elf.c\t2006-01-16 13:08:42.000000000 +1100\n" "+++ working-2.6/fs/binfmt_elf.c\t2006-02-23 09:54:52.000000000 +1100\n" "@@ -86,7 +86,8 @@ static struct linux_binfmt elf_format = \n" " \t\t.min_coredump\t= ELF_EXEC_PAGESIZE\n" @@ -151,7 +156,8 @@ " \t\t\tsend_sig(SIGKILL, current, 0);\n" " \t\t\tgoto out_free_dentry;\n" "Index: working-2.6/arch/ia64/kernel/sys_ia64.c\n" - "=================================--- working-2.6.orig/arch/ia64/kernel/sys_ia64.c\t2006-01-16 13:02:16.000000000 +1100\n" + "===================================================================\n" + "--- working-2.6.orig/arch/ia64/kernel/sys_ia64.c\t2006-01-16 13:02:16.000000000 +1100\n" "+++ working-2.6/arch/ia64/kernel/sys_ia64.c\t2006-02-23 09:54:52.000000000 +1100\n" "@@ -189,17 +189,6 @@ do_mmap2 (unsigned long addr, unsigned l\n" " \t\tgoto out;\n" @@ -179,4 +185,4 @@ "\t\t\t\t| _way_ _around_!\n" http://www.ozlabs.org/~dgibson -712c55d0f54714284ab73372a6756992e4170326f49716a7ba0bb558893c9b4f +8b9161168365e351095b119182853ddd360f11d1e5450a3c3d0b70450ba44916
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.