diff for duplicates of <20080425202219.GC13773@sgi.com> diff --git a/a/1.txt b/N1/1.txt index 6139564..c312e38 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,7 +15,8 @@ in the header file. 4 files changed, 24 insertions(+), 21 deletions(-) Index: linux-2.6/arch/ia64/kernel/uncached.c -=================================--- linux-2.6.orig/arch/ia64/kernel/uncached.c 2008-04-25 13:20:33.305200359 -0500 +=================================================================== +--- linux-2.6.orig/arch/ia64/kernel/uncached.c 2008-04-25 13:20:33.305200359 -0500 +++ linux-2.6/arch/ia64/kernel/uncached.c 2008-04-25 15:12:00.470227278 -0500 @@ -1,5 +1,5 @@ /* @@ -43,7 +44,7 @@ Index: linux-2.6/arch/ia64/kernel/uncached.c unsigned long uc_addr; struct uncached_pool *uc_pool; @@ -202,7 +203,8 @@ unsigned long uncached_alloc_page(int st - if (uc_pool->pool = NULL) + if (uc_pool->pool == NULL) continue; do { - uc_addr = gen_pool_alloc(uc_pool->pool, PAGE_SIZE); @@ -51,7 +52,7 @@ Index: linux-2.6/arch/ia64/kernel/uncached.c + n_pages * PAGE_SIZE); if (uc_addr != 0) return uc_addr; - } while (uncached_add_chunk(uc_pool, nid) = 0); + } while (uncached_add_chunk(uc_pool, nid) == 0); @@ -217,11 +219,12 @@ EXPORT_SYMBOL(uncached_alloc_page); /* * uncached_free_page @@ -78,7 +79,8 @@ Index: linux-2.6/arch/ia64/kernel/uncached.c EXPORT_SYMBOL(uncached_free_page); Index: linux-2.6/drivers/char/mspec.c -=================================--- linux-2.6.orig/drivers/char/mspec.c 2008-04-25 13:20:33.305200359 -0500 +=================================================================== +--- linux-2.6.orig/drivers/char/mspec.c 2008-04-25 13:20:33.305200359 -0500 +++ linux-2.6/drivers/char/mspec.c 2008-04-25 13:25:06.793568744 -0500 @@ -180,7 +180,7 @@ mspec_close(struct vm_area_struct *vma) my_page = vdata->maddr[index]; @@ -92,10 +94,10 @@ Index: linux-2.6/drivers/char/mspec.c @@ -209,7 +209,7 @@ mspec_nopfn(struct vm_area_struct *vma, index = (address - vdata->vm_start) >> PAGE_SHIFT; maddr = (volatile unsigned long) vdata->maddr[index]; - if (maddr = 0) { + if (maddr == 0) { - maddr = uncached_alloc_page(numa_node_id()); + maddr = uncached_alloc_page(numa_node_id(), 1); - if (maddr = 0) + if (maddr == 0) return NOPFN_OOM; @@ -218,7 +218,7 @@ mspec_nopfn(struct vm_area_struct *vma, @@ -113,7 +115,7 @@ Index: linux-2.6/drivers/char/mspec.c - scratch_page[nid] = uncached_alloc_page(nid); + scratch_page[nid] = uncached_alloc_page(nid, 1); - if (scratch_page[nid] = 0) + if (scratch_page[nid] == 0) goto free_scratch_pages; phys = __pa(scratch_page[nid]); @@ -414,7 +414,7 @@ mspec_init(void) @@ -135,7 +137,8 @@ Index: linux-2.6/drivers/char/mspec.c } } Index: linux-2.6/include/asm-ia64/uncached.h -=================================--- linux-2.6.orig/include/asm-ia64/uncached.h 2008-04-25 13:20:33.305200359 -0500 +=================================================================== +--- linux-2.6.orig/include/asm-ia64/uncached.h 2008-04-25 13:20:33.305200359 -0500 +++ linux-2.6/include/asm-ia64/uncached.h 2008-04-25 15:12:13.587833507 -0500 @@ -1,5 +1,5 @@ /* @@ -153,15 +156,16 @@ Index: linux-2.6/include/asm-ia64/uncached.h +extern unsigned long uncached_alloc_page(int starting_nid, int n_pages); +extern void uncached_free_page(unsigned long uc_addr, int n_pages); Index: linux-2.6/drivers/misc/sgi-xp/xpc_partition.c -=================================--- linux-2.6.orig/drivers/misc/sgi-xp/xpc_partition.c 2008-04-25 13:12:02.000000000 -0500 +=================================================================== +--- linux-2.6.orig/drivers/misc/sgi-xp/xpc_partition.c 2008-04-25 13:12:02.000000000 -0500 +++ linux-2.6/drivers/misc/sgi-xp/xpc_partition.c 2008-04-25 13:28:24.340999346 -0500 @@ -211,7 +211,7 @@ xpc_rsvd_page_init(void) */ amos_page = xpc_vars->amos_page; - if (amos_page = NULL) { + if (amos_page == NULL) { - amos_page = (AMO_t *)TO_AMO(uncached_alloc_page(0)); + amos_page = (AMO_t *)TO_AMO(uncached_alloc_page(0, 1)); - if (amos_page = NULL) { + if (amos_page == NULL) { dev_err(xpc_part, "can't allocate page of AMOs\n"); return NULL; @@ -230,7 +230,7 @@ xpc_rsvd_page_init(void) diff --git a/a/content_digest b/N1/content_digest index f34d2e0..64a8c5f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,6 @@ - "ref\020080422005004.0F97711C419@aqua.americas.sgi.com\0" "From\0Dean Nelson <dcn@sgi.com>\0" "Subject\0[PATCH] allocate multiple contiguous pages via uncached allocator -v3\0" - "Date\0Fri, 25 Apr 2008 20:22:19 +0000\0" + "Date\0Fri, 25 Apr 2008 15:22:19 -0500\0" "To\0jes@sgi.com" " tony.luck@intel.com\0" "Cc\0matthew@wil.cx" @@ -26,7 +25,8 @@ " 4 files changed, 24 insertions(+), 21 deletions(-)\n" "\n" "Index: linux-2.6/arch/ia64/kernel/uncached.c\n" - "=================================--- linux-2.6.orig/arch/ia64/kernel/uncached.c\t2008-04-25 13:20:33.305200359 -0500\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/ia64/kernel/uncached.c\t2008-04-25 13:20:33.305200359 -0500\n" "+++ linux-2.6/arch/ia64/kernel/uncached.c\t2008-04-25 15:12:00.470227278 -0500\n" "@@ -1,5 +1,5 @@\n" " /*\n" @@ -54,7 +54,7 @@ " \tunsigned long uc_addr;\n" " \tstruct uncached_pool *uc_pool;\n" "@@ -202,7 +203,8 @@ unsigned long uncached_alloc_page(int st\n" - " \t\tif (uc_pool->pool = NULL)\n" + " \t\tif (uc_pool->pool == NULL)\n" " \t\t\tcontinue;\n" " \t\tdo {\n" "-\t\t\tuc_addr = gen_pool_alloc(uc_pool->pool, PAGE_SIZE);\n" @@ -62,7 +62,7 @@ "+\t\t\t\t\t\t n_pages * PAGE_SIZE);\n" " \t\t\tif (uc_addr != 0)\n" " \t\t\t\treturn uc_addr;\n" - " \t\t} while (uncached_add_chunk(uc_pool, nid) = 0);\n" + " \t\t} while (uncached_add_chunk(uc_pool, nid) == 0);\n" "@@ -217,11 +219,12 @@ EXPORT_SYMBOL(uncached_alloc_page);\n" " /*\n" " * uncached_free_page\n" @@ -89,7 +89,8 @@ " EXPORT_SYMBOL(uncached_free_page);\n" " \n" "Index: linux-2.6/drivers/char/mspec.c\n" - "=================================--- linux-2.6.orig/drivers/char/mspec.c\t2008-04-25 13:20:33.305200359 -0500\n" + "===================================================================\n" + "--- linux-2.6.orig/drivers/char/mspec.c\t2008-04-25 13:20:33.305200359 -0500\n" "+++ linux-2.6/drivers/char/mspec.c\t2008-04-25 13:25:06.793568744 -0500\n" "@@ -180,7 +180,7 @@ mspec_close(struct vm_area_struct *vma)\n" " \t\tmy_page = vdata->maddr[index];\n" @@ -103,10 +104,10 @@ "@@ -209,7 +209,7 @@ mspec_nopfn(struct vm_area_struct *vma, \n" " \tindex = (address - vdata->vm_start) >> PAGE_SHIFT;\n" " \tmaddr = (volatile unsigned long) vdata->maddr[index];\n" - " \tif (maddr = 0) {\n" + " \tif (maddr == 0) {\n" "-\t\tmaddr = uncached_alloc_page(numa_node_id());\n" "+\t\tmaddr = uncached_alloc_page(numa_node_id(), 1);\n" - " \t\tif (maddr = 0)\n" + " \t\tif (maddr == 0)\n" " \t\t\treturn NOPFN_OOM;\n" " \n" "@@ -218,7 +218,7 @@ mspec_nopfn(struct vm_area_struct *vma, \n" @@ -124,7 +125,7 @@ " \n" "-\t\t\t\tscratch_page[nid] = uncached_alloc_page(nid);\n" "+\t\t\t\tscratch_page[nid] = uncached_alloc_page(nid, 1);\n" - " \t\t\t\tif (scratch_page[nid] = 0)\n" + " \t\t\t\tif (scratch_page[nid] == 0)\n" " \t\t\t\t\tgoto free_scratch_pages;\n" " \t\t\t\tphys = __pa(scratch_page[nid]);\n" "@@ -414,7 +414,7 @@ mspec_init(void)\n" @@ -146,7 +147,8 @@ " \t}\n" " }\n" "Index: linux-2.6/include/asm-ia64/uncached.h\n" - "=================================--- linux-2.6.orig/include/asm-ia64/uncached.h\t2008-04-25 13:20:33.305200359 -0500\n" + "===================================================================\n" + "--- linux-2.6.orig/include/asm-ia64/uncached.h\t2008-04-25 13:20:33.305200359 -0500\n" "+++ linux-2.6/include/asm-ia64/uncached.h\t2008-04-25 15:12:13.587833507 -0500\n" "@@ -1,5 +1,5 @@\n" " /*\n" @@ -164,15 +166,16 @@ "+extern unsigned long uncached_alloc_page(int starting_nid, int n_pages);\n" "+extern void uncached_free_page(unsigned long uc_addr, int n_pages);\n" "Index: linux-2.6/drivers/misc/sgi-xp/xpc_partition.c\n" - "=================================--- linux-2.6.orig/drivers/misc/sgi-xp/xpc_partition.c\t2008-04-25 13:12:02.000000000 -0500\n" + "===================================================================\n" + "--- linux-2.6.orig/drivers/misc/sgi-xp/xpc_partition.c\t2008-04-25 13:12:02.000000000 -0500\n" "+++ linux-2.6/drivers/misc/sgi-xp/xpc_partition.c\t2008-04-25 13:28:24.340999346 -0500\n" "@@ -211,7 +211,7 @@ xpc_rsvd_page_init(void)\n" " \t */\n" " \tamos_page = xpc_vars->amos_page;\n" - " \tif (amos_page = NULL) {\n" + " \tif (amos_page == NULL) {\n" "-\t\tamos_page = (AMO_t *)TO_AMO(uncached_alloc_page(0));\n" "+\t\tamos_page = (AMO_t *)TO_AMO(uncached_alloc_page(0, 1));\n" - " \t\tif (amos_page = NULL) {\n" + " \t\tif (amos_page == NULL) {\n" " \t\t\tdev_err(xpc_part, \"can't allocate page of AMOs\\n\");\n" " \t\t\treturn NULL;\n" "@@ -230,7 +230,7 @@ xpc_rsvd_page_init(void)\n" @@ -185,4 +188,4 @@ " \t\t\t}\n" " \t\t}" -b585adf9231294a6f5891f67ed34a6ae59bee1725ffb87a326896e8bdc48695a +a4574294c1f0deac0815d9d0d2be1c14053abe3ea3e4f2336b22ece93d0dcc36
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.