diff for duplicates of <20060426163151.GA8037@sgi.com> diff --git a/a/1.txt b/N1/1.txt index 777dda7..128e2fa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -43,7 +43,8 @@ Dean Index: linux-2.6/lib/genalloc.c -=================================--- linux-2.6.orig/lib/genalloc.c 2006-04-26 09:13:22.256905048 -0500 +=================================================================== +--- linux-2.6.orig/lib/genalloc.c 2006-04-26 09:13:22.256905048 -0500 +++ linux-2.6/lib/genalloc.c 2006-04-26 09:58:30.491095297 -0500 @@ -4,10 +4,6 @@ * Uses for this includes on-device special memory, uncached memory @@ -163,7 +164,7 @@ Index: linux-2.6/lib/genalloc.c + (nbits + BITS_PER_BYTE - 1) / BITS_PER_BYTE; + + chunk = kmalloc_node(nbytes, GFP_KERNEL, nid); -+ if (unlikely(chunk = NULL)) ++ if (unlikely(chunk == NULL)) + return -1; + + memset(chunk, 0, nbytes); @@ -197,7 +198,7 @@ Index: linux-2.6/lib/genalloc.c + int order = pool->min_alloc_order; + int nbits, bit, start_bit, end_bit; + -+ if (size = 0) ++ if (size == 0) return 0; - size = max(size, 1 << ALLOC_MIN_SHIFT); @@ -207,7 +208,7 @@ Index: linux-2.6/lib/genalloc.c - - spin_lock_irqsave(&poolp->lock, flags); - while (!h[j].next) { -- if (s = max_chunk_size) { +- if (s == max_chunk_size) { - struct gen_pool_link *ptr; - spin_unlock_irqrestore(&poolp->lock, flags); - ptr = (struct gen_pool_link *)poolp->get_new_chunk(poolp); @@ -305,7 +306,7 @@ Index: linux-2.6/lib/genalloc.c - - spin_lock_irqsave(&poolp->lock, flags); - while (1) { -- if (s = max_chunk_size) { +- if (s == max_chunk_size) { - ((struct gen_pool_link *)a)->next = h[i].next; - h[i].next = (struct gen_pool_link *)a; - break; @@ -351,7 +352,8 @@ Index: linux-2.6/lib/genalloc.c } EXPORT_SYMBOL(gen_pool_free); Index: linux-2.6/include/linux/genalloc.h -=================================--- linux-2.6.orig/include/linux/genalloc.h 2006-04-26 09:13:22.256905048 -0500 +=================================================================== +--- linux-2.6.orig/include/linux/genalloc.h 2006-04-26 09:13:22.256905048 -0500 +++ linux-2.6/include/linux/genalloc.h 2006-04-26 09:13:24.632674518 -0500 @@ -4,37 +4,32 @@ * Uses for this includes on-device special memory, uncached memory @@ -407,7 +409,8 @@ Index: linux-2.6/include/linux/genalloc.h +extern unsigned long gen_pool_alloc(struct gen_pool *, size_t); +extern void gen_pool_free(struct gen_pool *, unsigned long, size_t); Index: linux-2.6/arch/ia64/kernel/uncached.c -=================================--- linux-2.6.orig/arch/ia64/kernel/uncached.c 2006-04-26 09:13:22.260904660 -0500 +=================================================================== +--- linux-2.6.orig/arch/ia64/kernel/uncached.c 2006-04-26 09:13:22.260904660 -0500 +++ linux-2.6/arch/ia64/kernel/uncached.c 2006-04-26 11:05:15.431021964 -0500 @@ -1,5 +1,5 @@ /* @@ -596,16 +599,16 @@ Index: linux-2.6/arch/ia64/kernel/uncached.c + if (!node_online(nid)) + continue; + pool = uncached_pool[nid]; -+ if (pool = NULL) ++ if (pool == NULL) + continue; + do { + uc_addr = gen_pool_alloc(pool, PAGE_SIZE); + if (uc_addr != 0) + return uc_addr; -+ } while (uncached_add_chunk(pool, nid) = 0); ++ } while (uncached_add_chunk(pool, nid) == 0); - for (i = MAX_NUMNODES - 1; i >= 0; i--) { -- if (i = nid || !node_online(i)) +- if (i == nid || !node_online(i)) - continue; - maddr = gen_pool_alloc(uncached_pool[i], PAGE_SIZE); - dprintk(KERN_DEBUG "uncached_alloc_page alternate search " @@ -641,7 +644,7 @@ Index: linux-2.6/arch/ia64/kernel/uncached.c + struct gen_pool *pool = uncached_pool[nid]; - dprintk(KERN_DEBUG "uncached_free_page(%lx) on node %i\n", maddr, node); -+ if (unlikely(pool = NULL)) ++ if (unlikely(pool == NULL)) + return; - if ((maddr & (0XFUL << 60)) != __IA64_UNCACHED_OFFSET) @@ -717,7 +720,8 @@ Index: linux-2.6/arch/ia64/kernel/uncached.c } Index: linux-2.6/arch/ia64/sn/kernel/sn2/cache.c -=================================--- linux-2.6.orig/arch/ia64/sn/kernel/sn2/cache.c 2006-04-26 09:13:22.260904660 -0500 +=================================================================== +--- linux-2.6.orig/arch/ia64/sn/kernel/sn2/cache.c 2006-04-26 09:13:22.260904660 -0500 +++ linux-2.6/arch/ia64/sn/kernel/sn2/cache.c 2006-04-26 09:13:24.644673353 -0500 @@ -3,11 +3,12 @@ * License. See the file "COPYING" in the main directory of this archive @@ -747,7 +751,7 @@ Index: linux-2.6/arch/ia64/sn/kernel/sn2/cache.c + unsigned long addr = flush_addr; + + /* SHub1 requires a cached address */ -+ if (is_shub1() && (addr & RGN_BITS) = RGN_BASE(RGN_UNCACHED)) ++ if (is_shub1() && (addr & RGN_BITS) == RGN_BASE(RGN_UNCACHED)) + addr = (addr - RGN_BASE(RGN_UNCACHED)) + RGN_BASE(RGN_KERNEL); + + flush_icache_range(addr, addr + bytes); diff --git a/a/content_digest b/N1/content_digest index 459646d..8eb73f9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,7 +6,7 @@ "ref\0444F78AB.6030803@sgi.com\0" "From\0Dean Nelson <dcn@sgi.com>\0" "Subject\0Re: [PATCH] change gen_pool allocator to not touch managed memory\0" - "Date\0Wed, 26 Apr 2006 16:31:51 +0000\0" + "Date\0Wed, 26 Apr 2006 11:31:51 -0500\0" "To\0akpm@osdl.org\0" "Cc\0tony.luck@intel.com" avolkov@varma-el.com @@ -62,7 +62,8 @@ "\n" "\n" "Index: linux-2.6/lib/genalloc.c\n" - "=================================--- linux-2.6.orig/lib/genalloc.c\t2006-04-26 09:13:22.256905048 -0500\n" + "===================================================================\n" + "--- linux-2.6.orig/lib/genalloc.c\t2006-04-26 09:13:22.256905048 -0500\n" "+++ linux-2.6/lib/genalloc.c\t2006-04-26 09:58:30.491095297 -0500\n" "@@ -4,10 +4,6 @@\n" " * Uses for this includes on-device special memory, uncached memory\n" @@ -182,7 +183,7 @@ "+\t\t\t\t(nbits + BITS_PER_BYTE - 1) / BITS_PER_BYTE;\n" "+\n" "+\tchunk = kmalloc_node(nbytes, GFP_KERNEL, nid);\n" - "+\tif (unlikely(chunk = NULL))\n" + "+\tif (unlikely(chunk == NULL))\n" "+\t\treturn -1;\n" "+\n" "+\tmemset(chunk, 0, nbytes);\n" @@ -216,7 +217,7 @@ "+\tint order = pool->min_alloc_order;\n" "+\tint nbits, bit, start_bit, end_bit;\n" "+\n" - "+\tif (size = 0)\n" + "+\tif (size == 0)\n" " \t\treturn 0;\n" " \n" "-\tsize = max(size, 1 << ALLOC_MIN_SHIFT);\n" @@ -226,7 +227,7 @@ "-\n" "-\tspin_lock_irqsave(&poolp->lock, flags);\n" "-\twhile (!h[j].next) {\n" - "-\t\tif (s = max_chunk_size) {\n" + "-\t\tif (s == max_chunk_size) {\n" "-\t\t\tstruct gen_pool_link *ptr;\n" "-\t\t\tspin_unlock_irqrestore(&poolp->lock, flags);\n" "-\t\t\tptr = (struct gen_pool_link *)poolp->get_new_chunk(poolp);\n" @@ -324,7 +325,7 @@ "-\n" "-\tspin_lock_irqsave(&poolp->lock, flags);\n" "-\twhile (1) {\n" - "-\t\tif (s = max_chunk_size) {\n" + "-\t\tif (s == max_chunk_size) {\n" "-\t\t\t((struct gen_pool_link *)a)->next = h[i].next;\n" "-\t\t\th[i].next = (struct gen_pool_link *)a;\n" "-\t\t\tbreak;\n" @@ -370,7 +371,8 @@ " }\n" " EXPORT_SYMBOL(gen_pool_free);\n" "Index: linux-2.6/include/linux/genalloc.h\n" - "=================================--- linux-2.6.orig/include/linux/genalloc.h\t2006-04-26 09:13:22.256905048 -0500\n" + "===================================================================\n" + "--- linux-2.6.orig/include/linux/genalloc.h\t2006-04-26 09:13:22.256905048 -0500\n" "+++ linux-2.6/include/linux/genalloc.h\t2006-04-26 09:13:24.632674518 -0500\n" "@@ -4,37 +4,32 @@\n" " * Uses for this includes on-device special memory, uncached memory\n" @@ -426,7 +428,8 @@ "+extern unsigned long gen_pool_alloc(struct gen_pool *, size_t);\n" "+extern void gen_pool_free(struct gen_pool *, unsigned long, size_t);\n" "Index: linux-2.6/arch/ia64/kernel/uncached.c\n" - "=================================--- linux-2.6.orig/arch/ia64/kernel/uncached.c\t2006-04-26 09:13:22.260904660 -0500\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/ia64/kernel/uncached.c\t2006-04-26 09:13:22.260904660 -0500\n" "+++ linux-2.6/arch/ia64/kernel/uncached.c\t2006-04-26 11:05:15.431021964 -0500\n" "@@ -1,5 +1,5 @@\n" " /*\n" @@ -615,16 +618,16 @@ "+\t\tif (!node_online(nid))\n" "+\t\t\tcontinue;\n" "+\t\tpool = uncached_pool[nid];\n" - "+\t\tif (pool = NULL)\n" + "+\t\tif (pool == NULL)\n" "+\t\t\tcontinue;\n" "+\t\tdo {\n" "+\t\t\tuc_addr = gen_pool_alloc(pool, PAGE_SIZE);\n" "+\t\t\tif (uc_addr != 0)\n" "+\t\t\t\treturn uc_addr;\n" - "+\t\t} while (uncached_add_chunk(pool, nid) = 0);\n" + "+\t\t} while (uncached_add_chunk(pool, nid) == 0);\n" " \n" "-\t\tfor (i = MAX_NUMNODES - 1; i >= 0; i--) {\n" - "-\t\t\tif (i = nid || !node_online(i))\n" + "-\t\t\tif (i == nid || !node_online(i))\n" "-\t\t\t\tcontinue;\n" "-\t\t\tmaddr = gen_pool_alloc(uncached_pool[i], PAGE_SIZE);\n" "-\t\t\tdprintk(KERN_DEBUG \"uncached_alloc_page alternate search \"\n" @@ -660,7 +663,7 @@ "+\tstruct gen_pool *pool = uncached_pool[nid];\n" " \n" "-\tdprintk(KERN_DEBUG \"uncached_free_page(%lx) on node %i\\n\", maddr, node);\n" - "+\tif (unlikely(pool = NULL))\n" + "+\tif (unlikely(pool == NULL))\n" "+\t\treturn;\n" " \n" "-\tif ((maddr & (0XFUL << 60)) != __IA64_UNCACHED_OFFSET)\n" @@ -736,7 +739,8 @@ " }\n" " \n" "Index: linux-2.6/arch/ia64/sn/kernel/sn2/cache.c\n" - "=================================--- linux-2.6.orig/arch/ia64/sn/kernel/sn2/cache.c\t2006-04-26 09:13:22.260904660 -0500\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/ia64/sn/kernel/sn2/cache.c\t2006-04-26 09:13:22.260904660 -0500\n" "+++ linux-2.6/arch/ia64/sn/kernel/sn2/cache.c\t2006-04-26 09:13:24.644673353 -0500\n" "@@ -3,11 +3,12 @@\n" " * License. See the file \"COPYING\" in the main directory of this archive\n" @@ -766,7 +770,7 @@ "+\tunsigned long addr = flush_addr;\n" "+\n" "+\t/* SHub1 requires a cached address */\n" - "+\tif (is_shub1() && (addr & RGN_BITS) = RGN_BASE(RGN_UNCACHED))\n" + "+\tif (is_shub1() && (addr & RGN_BITS) == RGN_BASE(RGN_UNCACHED))\n" "+\t\taddr = (addr - RGN_BASE(RGN_UNCACHED)) + RGN_BASE(RGN_KERNEL);\n" "+\n" "+\tflush_icache_range(addr, addr + bytes);\n" @@ -781,4 +785,4 @@ " }\n" EXPORT_SYMBOL(sn_flush_all_caches); -5fa4e79661b2060f2e5097f653822a0fc555c4f0653c884daf513f850b9e1382 +cdd324e9061594b36f9d1ebeb15c1b648f9d34a90d45001355a970d48453b379
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.