diff for duplicates of <20070912015646.114863484@sgi.com> diff --git a/a/1.txt b/N1/1.txt index 2ce6716..8a07446 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -76,8 +76,8 @@ Signed-off-by: Mike Travis <travis@sgi.com> DEFINE_PER_CPU(cpumask_t, cpu_core_map); @@ -319,8 +319,8 @@ for_each_cpu_mask(i, cpu_sibling_setup_map) { - if (c[cpu].phys_proc_id == c[i].phys_proc_id && - c[cpu].cpu_core_id == c[i].cpu_core_id) { + if (c[cpu].phys_proc_id = c[i].phys_proc_id && + c[cpu].cpu_core_id = c[i].cpu_core_id) { - cpu_set(i, cpu_sibling_map[cpu]); - cpu_set(cpu, cpu_sibling_map[i]); + cpu_set(i, per_cpu(cpu_sibling_map, cpu)); @@ -95,7 +95,7 @@ Signed-off-by: Mike Travis <travis@sgi.com> cpu_set(cpu, c[cpu].llc_shared_map); - if (current_cpu_data.x86_max_cores == 1) { + if (current_cpu_data.x86_max_cores = 1) { - per_cpu(cpu_core_map, cpu) = cpu_sibling_map[cpu]; + per_cpu(cpu_core_map, cpu) = per_cpu(cpu_sibling_map, cpu); c[cpu].booted_cores = 1; @@ -105,14 +105,14 @@ Signed-off-by: Mike Travis <travis@sgi.com> /* * Does this new cpu bringup a new core? */ -- if (cpus_weight(cpu_sibling_map[cpu]) == 1) { -+ if (cpus_weight(per_cpu(cpu_sibling_map, cpu)) == 1) { +- if (cpus_weight(cpu_sibling_map[cpu]) = 1) { ++ if (cpus_weight(per_cpu(cpu_sibling_map, cpu)) = 1) { /* * for each core in package, increment * the booted_cores for this new cpu */ -- if (first_cpu(cpu_sibling_map[i]) == i) -+ if (first_cpu(per_cpu(cpu_sibling_map, i)) == i) +- if (first_cpu(cpu_sibling_map[i]) = i) ++ if (first_cpu(per_cpu(cpu_sibling_map, i)) = i) c[cpu].booted_cores++; /* * increment the core count for all @@ -166,8 +166,8 @@ Signed-off-by: Mike Travis <travis@sgi.com> /*/ * last thread sibling in this cpu core going down */ -- if (cpus_weight(cpu_sibling_map[cpu]) == 1) -+ if (cpus_weight(per_cpu(cpu_sibling_map, cpu)) == 1) +- if (cpus_weight(cpu_sibling_map[cpu]) = 1) ++ if (cpus_weight(per_cpu(cpu_sibling_map, cpu)) = 1) c[sibling].booted_cores--; } @@ -226,8 +226,8 @@ Signed-off-by: Mike Travis <travis@sgi.com> DEFINE_PER_CPU(cpumask_t, cpu_core_map); @@ -264,8 +264,8 @@ for_each_cpu_mask(i, cpu_sibling_setup_map) { - if (c[cpu].phys_proc_id == c[i].phys_proc_id && - c[cpu].cpu_core_id == c[i].cpu_core_id) { + if (c[cpu].phys_proc_id = c[i].phys_proc_id && + c[cpu].cpu_core_id = c[i].cpu_core_id) { - cpu_set(i, cpu_sibling_map[cpu]); - cpu_set(cpu, cpu_sibling_map[i]); + cpu_set(i, per_cpu(cpu_sibling_map, cpu)); @@ -245,7 +245,7 @@ Signed-off-by: Mike Travis <travis@sgi.com> cpu_set(cpu, c[cpu].llc_shared_map); - if (current_cpu_data.x86_max_cores == 1) { + if (current_cpu_data.x86_max_cores = 1) { - per_cpu(cpu_core_map, cpu) = cpu_sibling_map[cpu]; + per_cpu(cpu_core_map, cpu) = per_cpu(cpu_sibling_map, cpu); c[cpu].booted_cores = 1; @@ -255,14 +255,14 @@ Signed-off-by: Mike Travis <travis@sgi.com> /* * Does this new cpu bringup a new core? */ -- if (cpus_weight(cpu_sibling_map[cpu]) == 1) { -+ if (cpus_weight(per_cpu(cpu_sibling_map, cpu)) == 1) { +- if (cpus_weight(cpu_sibling_map[cpu]) = 1) { ++ if (cpus_weight(per_cpu(cpu_sibling_map, cpu)) = 1) { /* * for each core in package, increment * the booted_cores for this new cpu */ -- if (first_cpu(cpu_sibling_map[i]) == i) -+ if (first_cpu(per_cpu(cpu_sibling_map, i)) == i) +- if (first_cpu(cpu_sibling_map[i]) = i) ++ if (first_cpu(per_cpu(cpu_sibling_map, i)) = i) c[cpu].booted_cores++; /* * increment the core count for all @@ -279,8 +279,8 @@ Signed-off-by: Mike Travis <travis@sgi.com> /* * last thread sibling in this cpu core going down */ -- if (cpus_weight(cpu_sibling_map[cpu]) == 1) -+ if (cpus_weight(per_cpu(cpu_sibling_map, cpu)) == 1) +- if (cpus_weight(cpu_sibling_map[cpu]) = 1) ++ if (cpus_weight(per_cpu(cpu_sibling_map, cpu)) = 1) c[sibling].booted_cores--; } @@ -301,7 +301,7 @@ Signed-off-by: Mike Travis <travis@sgi.com> - for_each_cpu_mask(i, cpu_sibling_map[cpu]) { + for_each_cpu_mask(i, per_cpu(cpu_sibling_map, cpu)) { - if (i == cpu) + if (i = cpu) continue; --- a/include/asm-i386/smp.h diff --git a/a/content_digest b/N1/content_digest index 1721c53..8685824 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,14 @@ "ref\020070912015644.927677070@sgi.com\0" "From\0travis@sgi.com\0" "Subject\0[PATCH 04/10] x86: Convert cpu_sibling_map to be a per cpu variable (v3)\0" - "Date\0Tue, 11 Sep 2007 18:56:48 -0700\0" + "Date\0Wed, 12 Sep 2007 01:56:48 +0000\0" "To\0Andrew Morton <akpm@linux-foundation.org>\0" - "Cc\0linux-mm@kvack.org" - Andi Kleen <ak@suse.de> + "Cc\0Andi Kleen <ak@suse.de>" + Christoph Lameter <clameter@sgi.com> + linux-mm@kvack.org linux-kernel@vger.kernel.org linuxppc-dev@ozlabs.org - sparclinux@vger.kernel.org - " Christoph Lameter <clameter@sgi.com>\0" + " sparclinux@vger.kernel.org\0" "\00:1\0" "b\0" "Convert cpu_sibling_map from a static array sized by NR_CPUS to a\n" @@ -89,8 +89,8 @@ " DEFINE_PER_CPU(cpumask_t, cpu_core_map);\n" "@@ -319,8 +319,8 @@\n" " \t\tfor_each_cpu_mask(i, cpu_sibling_setup_map) {\n" - " \t\t\tif (c[cpu].phys_proc_id == c[i].phys_proc_id &&\n" - " \t\t\t c[cpu].cpu_core_id == c[i].cpu_core_id) {\n" + " \t\t\tif (c[cpu].phys_proc_id = c[i].phys_proc_id &&\n" + " \t\t\t c[cpu].cpu_core_id = c[i].cpu_core_id) {\n" "-\t\t\t\tcpu_set(i, cpu_sibling_map[cpu]);\n" "-\t\t\t\tcpu_set(cpu, cpu_sibling_map[i]);\n" "+\t\t\t\tcpu_set(i, per_cpu(cpu_sibling_map, cpu));\n" @@ -108,7 +108,7 @@ " \n" " \tcpu_set(cpu, c[cpu].llc_shared_map);\n" " \n" - " \tif (current_cpu_data.x86_max_cores == 1) {\n" + " \tif (current_cpu_data.x86_max_cores = 1) {\n" "-\t\tper_cpu(cpu_core_map, cpu) = cpu_sibling_map[cpu];\n" "+\t\tper_cpu(cpu_core_map, cpu) = per_cpu(cpu_sibling_map, cpu);\n" " \t\tc[cpu].booted_cores = 1;\n" @@ -118,14 +118,14 @@ " \t\t\t/*\n" " \t\t\t * Does this new cpu bringup a new core?\n" " \t\t\t */\n" - "-\t\t\tif (cpus_weight(cpu_sibling_map[cpu]) == 1) {\n" - "+\t\t\tif (cpus_weight(per_cpu(cpu_sibling_map, cpu)) == 1) {\n" + "-\t\t\tif (cpus_weight(cpu_sibling_map[cpu]) = 1) {\n" + "+\t\t\tif (cpus_weight(per_cpu(cpu_sibling_map, cpu)) = 1) {\n" " \t\t\t\t/*\n" " \t\t\t\t * for each core in package, increment\n" " \t\t\t\t * the booted_cores for this new cpu\n" " \t\t\t\t */\n" - "-\t\t\t\tif (first_cpu(cpu_sibling_map[i]) == i)\n" - "+\t\t\t\tif (first_cpu(per_cpu(cpu_sibling_map, i)) == i)\n" + "-\t\t\t\tif (first_cpu(cpu_sibling_map[i]) = i)\n" + "+\t\t\t\tif (first_cpu(per_cpu(cpu_sibling_map, i)) = i)\n" " \t\t\t\t\tc[cpu].booted_cores++;\n" " \t\t\t\t/*\n" " \t\t\t\t * increment the core count for all\n" @@ -179,8 +179,8 @@ " \t\t/*/\n" " \t\t * last thread sibling in this cpu core going down\n" " \t\t */\n" - "-\t\tif (cpus_weight(cpu_sibling_map[cpu]) == 1)\n" - "+\t\tif (cpus_weight(per_cpu(cpu_sibling_map, cpu)) == 1)\n" + "-\t\tif (cpus_weight(cpu_sibling_map[cpu]) = 1)\n" + "+\t\tif (cpus_weight(per_cpu(cpu_sibling_map, cpu)) = 1)\n" " \t\t\tc[sibling].booted_cores--;\n" " \t}\n" " \t\t\t\n" @@ -239,8 +239,8 @@ " DEFINE_PER_CPU(cpumask_t, cpu_core_map);\n" "@@ -264,8 +264,8 @@\n" " \t\tfor_each_cpu_mask(i, cpu_sibling_setup_map) {\n" - " \t\t\tif (c[cpu].phys_proc_id == c[i].phys_proc_id &&\n" - " \t\t\t c[cpu].cpu_core_id == c[i].cpu_core_id) {\n" + " \t\t\tif (c[cpu].phys_proc_id = c[i].phys_proc_id &&\n" + " \t\t\t c[cpu].cpu_core_id = c[i].cpu_core_id) {\n" "-\t\t\t\tcpu_set(i, cpu_sibling_map[cpu]);\n" "-\t\t\t\tcpu_set(cpu, cpu_sibling_map[i]);\n" "+\t\t\t\tcpu_set(i, per_cpu(cpu_sibling_map, cpu));\n" @@ -258,7 +258,7 @@ " \n" " \tcpu_set(cpu, c[cpu].llc_shared_map);\n" " \n" - " \tif (current_cpu_data.x86_max_cores == 1) {\n" + " \tif (current_cpu_data.x86_max_cores = 1) {\n" "-\t\tper_cpu(cpu_core_map, cpu) = cpu_sibling_map[cpu];\n" "+\t\tper_cpu(cpu_core_map, cpu) = per_cpu(cpu_sibling_map, cpu);\n" " \t\tc[cpu].booted_cores = 1;\n" @@ -268,14 +268,14 @@ " \t\t\t/*\n" " \t\t\t * Does this new cpu bringup a new core?\n" " \t\t\t */\n" - "-\t\t\tif (cpus_weight(cpu_sibling_map[cpu]) == 1) {\n" - "+\t\t\tif (cpus_weight(per_cpu(cpu_sibling_map, cpu)) == 1) {\n" + "-\t\t\tif (cpus_weight(cpu_sibling_map[cpu]) = 1) {\n" + "+\t\t\tif (cpus_weight(per_cpu(cpu_sibling_map, cpu)) = 1) {\n" " \t\t\t\t/*\n" " \t\t\t\t * for each core in package, increment\n" " \t\t\t\t * the booted_cores for this new cpu\n" " \t\t\t\t */\n" - "-\t\t\t\tif (first_cpu(cpu_sibling_map[i]) == i)\n" - "+\t\t\t\tif (first_cpu(per_cpu(cpu_sibling_map, i)) == i)\n" + "-\t\t\t\tif (first_cpu(cpu_sibling_map[i]) = i)\n" + "+\t\t\t\tif (first_cpu(per_cpu(cpu_sibling_map, i)) = i)\n" " \t\t\t\t\tc[cpu].booted_cores++;\n" " \t\t\t\t/*\n" " \t\t\t\t * increment the core count for all\n" @@ -292,8 +292,8 @@ " \t\t/*\n" " \t\t * last thread sibling in this cpu core going down\n" " \t\t */\n" - "-\t\tif (cpus_weight(cpu_sibling_map[cpu]) == 1)\n" - "+\t\tif (cpus_weight(per_cpu(cpu_sibling_map, cpu)) == 1)\n" + "-\t\tif (cpus_weight(cpu_sibling_map[cpu]) = 1)\n" + "+\t\tif (cpus_weight(per_cpu(cpu_sibling_map, cpu)) = 1)\n" " \t\t\tc[sibling].booted_cores--;\n" " \t}\n" " \t\t\t\n" @@ -314,7 +314,7 @@ " \n" "-\t\tfor_each_cpu_mask(i, cpu_sibling_map[cpu]) {\n" "+\t\tfor_each_cpu_mask(i, per_cpu(cpu_sibling_map, cpu)) {\n" - " \t\t\tif (i == cpu)\n" + " \t\t\tif (i = cpu)\n" " \t\t\t\tcontinue;\n" " \n" "--- a/include/asm-i386/smp.h\n" @@ -410,4 +410,4 @@ "\n" -- -1a042de455f18429d1443b55b6bb7bd37843877f0aa2b86ff78eedbce0fd7f66 +2b3a974100cef60384e9334db6a9918c51debb07c334e78c53d277d068bf1b4d
diff --git a/a/content_digest b/N2/content_digest index 1721c53..79f1cc1 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,13 +3,14 @@ "Subject\0[PATCH 04/10] x86: Convert cpu_sibling_map to be a per cpu variable (v3)\0" "Date\0Tue, 11 Sep 2007 18:56:48 -0700\0" "To\0Andrew Morton <akpm@linux-foundation.org>\0" - "Cc\0linux-mm@kvack.org" - Andi Kleen <ak@suse.de> + "Cc\0Andi Kleen <ak@suse.de>" + Christoph Lameter <clameter@sgi.com> + linux-mm@kvack.org linux-kernel@vger.kernel.org linuxppc-dev@ozlabs.org - sparclinux@vger.kernel.org - " Christoph Lameter <clameter@sgi.com>\0" + " sparclinux@vger.kernel.org\0" "\00:1\0" + "fn\0convert-cpu_sibling_map-to-per_cpu_data\0" "b\0" "Convert cpu_sibling_map from a static array sized by NR_CPUS to a\n" "per_cpu variable. This saves sizeof(cpumask_t) * NR unused cpus.\n" @@ -410,4 +411,4 @@ "\n" -- -1a042de455f18429d1443b55b6bb7bd37843877f0aa2b86ff78eedbce0fd7f66 +3c84ecabec6fe484e6a032954706895cb2adf326afd408731bd048c68dcf26e1
diff --git a/a/1.txt b/N3/1.txt index 2ce6716..af169df 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -395,4 +395,10 @@ Signed-off-by: Mike Travis <travis@sgi.com> if (i != first_cpu(this_sibling_map)) continue; +-- + -- +To unsubscribe, send a message with 'unsubscribe linux-mm' in +the body to majordomo@kvack.org. For more info on Linux MM, +see: http://www.linux-mm.org/ . +Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N3/content_digest index 1721c53..5f1f93b 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -3,13 +3,14 @@ "Subject\0[PATCH 04/10] x86: Convert cpu_sibling_map to be a per cpu variable (v3)\0" "Date\0Tue, 11 Sep 2007 18:56:48 -0700\0" "To\0Andrew Morton <akpm@linux-foundation.org>\0" - "Cc\0linux-mm@kvack.org" - Andi Kleen <ak@suse.de> + "Cc\0Andi Kleen <ak@suse.de>" + Christoph Lameter <clameter@sgi.com> + linux-mm@kvack.org linux-kernel@vger.kernel.org linuxppc-dev@ozlabs.org - sparclinux@vger.kernel.org - " Christoph Lameter <clameter@sgi.com>\0" + " sparclinux@vger.kernel.org\0" "\00:1\0" + "fn\0convert-cpu_sibling_map-to-per_cpu_data\0" "b\0" "Convert cpu_sibling_map from a static array sized by NR_CPUS to a\n" "per_cpu variable. This saves sizeof(cpumask_t) * NR unused cpus.\n" @@ -408,6 +409,12 @@ " \t\tif (i != first_cpu(this_sibling_map))\n" " \t\t\tcontinue;\n" "\n" - -- + "-- \n" + "\n" + "--\n" + "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" + "the body to majordomo@kvack.org. For more info on Linux MM,\n" + "see: http://www.linux-mm.org/ .\n" + "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -1a042de455f18429d1443b55b6bb7bd37843877f0aa2b86ff78eedbce0fd7f66 +fda0fa34b7ccf1563ebee5d9fb7f77e845894d82e9694cdd07a9884481fb09ee
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.