diff for duplicates of <20080326220016.GA31138@sgi.com> diff --git a/a/1.txt b/N1/1.txt index dc48c68..fe38bf4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,7 +11,8 @@ Signed-off-by: Dean Nelson <dcn@sgi.com> 3 files changed, 20 insertions(+), 17 deletions(-) Index: linux-2.6/arch/ia64/kernel/uncached.c -=================================--- linux-2.6.orig/arch/ia64/kernel/uncached.c 2007-10-04 06:52:20.000000000 -0500 +=================================================================== +--- linux-2.6.orig/arch/ia64/kernel/uncached.c 2007-10-04 06:52:20.000000000 -0500 +++ linux-2.6/arch/ia64/kernel/uncached.c 2007-11-08 12:14:31.408258515 -0600 @@ -177,12 +177,13 @@ * uncached_alloc_page @@ -32,7 +33,7 @@ Index: linux-2.6/arch/ia64/kernel/uncached.c unsigned long uc_addr; struct uncached_pool *uc_pool; @@ -202,7 +203,8 @@ - if (uc_pool->pool = NULL) + if (uc_pool->pool == NULL) continue; do { - uc_addr = gen_pool_alloc(uc_pool->pool, PAGE_SIZE); @@ -40,7 +41,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 @@ /* * uncached_free_page @@ -67,7 +68,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 2007-10-04 06:52:21.000000000 -0500 +=================================================================== +--- linux-2.6.orig/drivers/char/mspec.c 2007-10-04 06:52:21.000000000 -0500 +++ linux-2.6/drivers/char/mspec.c 2007-11-08 12:07:17.458415225 -0600 @@ -180,7 +180,7 @@ my_page = vdata->maddr[index]; @@ -81,10 +83,10 @@ Index: linux-2.6/drivers/char/mspec.c @@ -209,7 +209,7 @@ 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 @@ @@ -102,7 +104,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 @@ @@ -124,7 +126,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 2007-10-04 06:52:25.000000000 -0500 +=================================================================== +--- linux-2.6.orig/include/asm-ia64/uncached.h 2007-10-04 06:52:25.000000000 -0500 +++ linux-2.6/include/asm-ia64/uncached.h 2007-11-08 12:05:00.633469891 -0600 @@ -8,5 +8,5 @@ * Prototypes for the uncached page allocator diff --git a/a/content_digest b/N1/content_digest index e0af0e6..6d65fca 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,12 +1,13 @@ "ref\020080326215807.GF31340@sgi.com\0" "From\0Dean Nelson <dcn@sgi.com>\0" "Subject\0[Patch 1/5] add multi-page allocation to the uncached allocator -v3\0" - "Date\0Wed, 26 Mar 2008 22:00:16 +0000\0" + "Date\0Wed, 26 Mar 2008 17:00:16 -0500\0" "To\0jes@sgi.com" tony.luck@intel.com linux-kernel@vger.kernel.org " linux-ia64@vger.kernel.org\0" "\00:1\0" + "fn\0uncached-pages\0" "b\0" "Enable the uncached allocator to allocate multiple pages of contiguous\n" "uncached memory.\n" @@ -21,7 +22,8 @@ " 3 files changed, 20 insertions(+), 17 deletions(-)\n" "\n" "Index: linux-2.6/arch/ia64/kernel/uncached.c\n" - "=================================--- linux-2.6.orig/arch/ia64/kernel/uncached.c\t2007-10-04 06:52:20.000000000 -0500\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/ia64/kernel/uncached.c\t2007-10-04 06:52:20.000000000 -0500\n" "+++ linux-2.6/arch/ia64/kernel/uncached.c\t2007-11-08 12:14:31.408258515 -0600\n" "@@ -177,12 +177,13 @@\n" " * uncached_alloc_page\n" @@ -42,7 +44,7 @@ " \tunsigned long uc_addr;\n" " \tstruct uncached_pool *uc_pool;\n" "@@ -202,7 +203,8 @@\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" @@ -50,7 +52,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 @@\n" " /*\n" " * uncached_free_page\n" @@ -77,7 +79,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\t2007-10-04 06:52:21.000000000 -0500\n" + "===================================================================\n" + "--- linux-2.6.orig/drivers/char/mspec.c\t2007-10-04 06:52:21.000000000 -0500\n" "+++ linux-2.6/drivers/char/mspec.c\t2007-11-08 12:07:17.458415225 -0600\n" "@@ -180,7 +180,7 @@\n" " \t\tmy_page = vdata->maddr[index];\n" @@ -91,10 +94,10 @@ "@@ -209,7 +209,7 @@\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 @@\n" @@ -112,7 +115,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 @@\n" @@ -134,7 +137,8 @@ " \t}\n" " }\n" "Index: linux-2.6/include/asm-ia64/uncached.h\n" - "=================================--- linux-2.6.orig/include/asm-ia64/uncached.h\t2007-10-04 06:52:25.000000000 -0500\n" + "===================================================================\n" + "--- linux-2.6.orig/include/asm-ia64/uncached.h\t2007-10-04 06:52:25.000000000 -0500\n" "+++ linux-2.6/include/asm-ia64/uncached.h\t2007-11-08 12:05:00.633469891 -0600\n" "@@ -8,5 +8,5 @@\n" " * Prototypes for the uncached page allocator\n" @@ -145,4 +149,4 @@ "+extern unsigned long uncached_alloc_page(int, int);\n" +extern void uncached_free_page(unsigned long, int); -67842e41c2f672d9ad93eeb7ee13e89f12c21d1e6eefd73c40fd93d5b22fccab +2645cecfcd1137456fa2919783fb42ed7a242daa44219e87561204f51cc82b0c
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.