diff for duplicates of <20070912015645.838964719@sgi.com> diff --git a/a/1.txt b/N1/1.txt index eaa98dc..61b247f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -50,7 +50,7 @@ Signed-off-by: Mike Travis <travis@sgi.com> +++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c @@ -595,7 +595,7 @@ dmi_check_system(sw_any_bug_dmi_table); - if (bios_with_sw_any_bug && cpus_weight(policy->cpus) == 1) { + if (bios_with_sw_any_bug && cpus_weight(policy->cpus) = 1) { policy->shared_type = CPUFREQ_SHARED_TYPE_ALL; - policy->cpus = cpu_core_map[cpu]; + policy->cpus = per_cpu(cpu_core_map, cpu); @@ -72,8 +72,8 @@ Signed-off-by: Mike Travis <travis@sgi.com> dprintk("cfid 0x%x, cvid 0x%x\n", data->currfid, data->currvid); data->powernow_table = powernow_table; -- if (first_cpu(cpu_core_map[data->cpu]) == data->cpu) -+ if (first_cpu(per_cpu(cpu_core_map, data->cpu)) == data->cpu) +- if (first_cpu(cpu_core_map[data->cpu]) = data->cpu) ++ if (first_cpu(per_cpu(cpu_core_map, data->cpu)) = data->cpu) print_basics(data); for (j = 0; j < data->numps; j++) @@ -81,13 +81,13 @@ Signed-off-by: Mike Travis <travis@sgi.com> /* fill in data */ data->numps = data->acpi_data.state_count; -- if (first_cpu(cpu_core_map[data->cpu]) == data->cpu) -+ if (first_cpu(per_cpu(cpu_core_map, data->cpu)) == data->cpu) +- if (first_cpu(cpu_core_map[data->cpu]) = data->cpu) ++ if (first_cpu(per_cpu(cpu_core_map, data->cpu)) = data->cpu) print_basics(data); powernow_k8_acpi_pst_values(data, 0); @@ -1212,7 +1212,7 @@ - if (cpu_family == CPU_HW_PSTATE) + if (cpu_family = CPU_HW_PSTATE) pol->cpus = cpumask_of_cpu(pol->cpu); else - pol->cpus = cpu_core_map[pol->cpu]; @@ -139,7 +139,7 @@ Signed-off-by: Mike Travis <travis@sgi.com> return c->llc_shared_map; } @@ -321,8 +321,8 @@ - c[cpu].cpu_core_id == c[i].cpu_core_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, cpu_core_map[cpu]); @@ -152,7 +152,7 @@ Signed-off-by: Mike Travis <travis@sgi.com> @@ -334,7 +334,7 @@ cpu_set(cpu, c[cpu].llc_shared_map); - if (current_cpu_data.x86_max_cores == 1) { + if (current_cpu_data.x86_max_cores = 1) { - cpu_core_map[cpu] = cpu_sibling_map[cpu]; + per_cpu(cpu_core_map, cpu) = cpu_sibling_map[cpu]; c[cpu].booted_cores = 1; @@ -161,7 +161,7 @@ Signed-off-by: Mike Travis <travis@sgi.com> @@ -346,8 +346,8 @@ cpu_set(cpu, c[i].llc_shared_map); } - if (c[cpu].phys_proc_id == c[i].phys_proc_id) { + if (c[cpu].phys_proc_id = c[i].phys_proc_id) { - cpu_set(i, cpu_core_map[cpu]); - cpu_set(cpu, cpu_core_map[i]); + cpu_set(i, per_cpu(cpu_core_map, cpu)); @@ -222,7 +222,7 @@ 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(cpu_sibling_map[cpu]) = 1) @@ -1160,7 +1160,7 @@ for_each_cpu_mask(sibling, cpu_sibling_map[cpu]) cpu_clear(cpu, cpu_sibling_map[sibling]); @@ -326,7 +326,7 @@ Signed-off-by: Mike Travis <travis@sgi.com> return c->llc_shared_map; } @@ -266,8 +266,8 @@ - c[cpu].cpu_core_id == c[i].cpu_core_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, cpu_core_map[cpu]); @@ -339,7 +339,7 @@ Signed-off-by: Mike Travis <travis@sgi.com> @@ -279,7 +279,7 @@ cpu_set(cpu, c[cpu].llc_shared_map); - if (current_cpu_data.x86_max_cores == 1) { + if (current_cpu_data.x86_max_cores = 1) { - cpu_core_map[cpu] = cpu_sibling_map[cpu]; + per_cpu(cpu_core_map, cpu) = cpu_sibling_map[cpu]; c[cpu].booted_cores = 1; @@ -348,7 +348,7 @@ Signed-off-by: Mike Travis <travis@sgi.com> @@ -291,8 +291,8 @@ cpu_set(cpu, c[i].llc_shared_map); } - if (c[cpu].phys_proc_id == c[i].phys_proc_id) { + if (c[cpu].phys_proc_id = c[i].phys_proc_id) { - cpu_set(i, cpu_core_map[cpu]); - cpu_set(cpu, cpu_core_map[i]); + cpu_set(i, per_cpu(cpu_core_map, cpu)); diff --git a/a/content_digest b/N1/content_digest index af4f182..7c003ef 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 03/10] x86: Convert cpu_core_map to be a per cpu variable (v3)\0" - "Date\0Tue, 11 Sep 2007 18:56:47 -0700\0" + "Date\0Wed, 12 Sep 2007 01:56:47 +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" "This is from an earlier message from 'Christoph Lameter':\n" @@ -63,7 +63,7 @@ "+++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c\n" "@@ -595,7 +595,7 @@\n" " \tdmi_check_system(sw_any_bug_dmi_table);\n" - " \tif (bios_with_sw_any_bug && cpus_weight(policy->cpus) == 1) {\n" + " \tif (bios_with_sw_any_bug && cpus_weight(policy->cpus) = 1) {\n" " \t\tpolicy->shared_type = CPUFREQ_SHARED_TYPE_ALL;\n" "-\t\tpolicy->cpus = cpu_core_map[cpu];\n" "+\t\tpolicy->cpus = per_cpu(cpu_core_map, cpu);\n" @@ -85,8 +85,8 @@ " \n" " \tdprintk(\"cfid 0x%x, cvid 0x%x\\n\", data->currfid, data->currvid);\n" " \tdata->powernow_table = powernow_table;\n" - "-\tif (first_cpu(cpu_core_map[data->cpu]) == data->cpu)\n" - "+\tif (first_cpu(per_cpu(cpu_core_map, data->cpu)) == data->cpu)\n" + "-\tif (first_cpu(cpu_core_map[data->cpu]) = data->cpu)\n" + "+\tif (first_cpu(per_cpu(cpu_core_map, data->cpu)) = data->cpu)\n" " \t\tprint_basics(data);\n" " \n" " \tfor (j = 0; j < data->numps; j++)\n" @@ -94,13 +94,13 @@ " \n" " \t/* fill in data */\n" " \tdata->numps = data->acpi_data.state_count;\n" - "-\tif (first_cpu(cpu_core_map[data->cpu]) == data->cpu)\n" - "+\tif (first_cpu(per_cpu(cpu_core_map, data->cpu)) == data->cpu)\n" + "-\tif (first_cpu(cpu_core_map[data->cpu]) = data->cpu)\n" + "+\tif (first_cpu(per_cpu(cpu_core_map, data->cpu)) = data->cpu)\n" " \t\tprint_basics(data);\n" " \tpowernow_k8_acpi_pst_values(data, 0);\n" " \n" "@@ -1212,7 +1212,7 @@\n" - " \tif (cpu_family == CPU_HW_PSTATE)\n" + " \tif (cpu_family = CPU_HW_PSTATE)\n" " \t\tpol->cpus = cpumask_of_cpu(pol->cpu);\n" " \telse\n" "-\t\tpol->cpus = cpu_core_map[pol->cpu];\n" @@ -152,7 +152,7 @@ " \t\treturn c->llc_shared_map;\n" " }\n" "@@ -321,8 +321,8 @@\n" - " \t\t\t c[cpu].cpu_core_id == c[i].cpu_core_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, cpu_core_map[cpu]);\n" @@ -165,7 +165,7 @@ "@@ -334,7 +334,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\tcpu_core_map[cpu] = cpu_sibling_map[cpu];\n" "+\t\tper_cpu(cpu_core_map, cpu) = cpu_sibling_map[cpu];\n" " \t\tc[cpu].booted_cores = 1;\n" @@ -174,7 +174,7 @@ "@@ -346,8 +346,8 @@\n" " \t\t\tcpu_set(cpu, c[i].llc_shared_map);\n" " \t\t}\n" - " \t\tif (c[cpu].phys_proc_id == c[i].phys_proc_id) {\n" + " \t\tif (c[cpu].phys_proc_id = c[i].phys_proc_id) {\n" "-\t\t\tcpu_set(i, cpu_core_map[cpu]);\n" "-\t\t\tcpu_set(cpu, cpu_core_map[i]);\n" "+\t\t\tcpu_set(i, per_cpu(cpu_core_map, cpu));\n" @@ -235,7 +235,7 @@ "+\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(cpu_sibling_map[cpu]) = 1)\n" "@@ -1160,7 +1160,7 @@\n" " \tfor_each_cpu_mask(sibling, cpu_sibling_map[cpu])\n" " \t\tcpu_clear(cpu, cpu_sibling_map[sibling]);\n" @@ -339,7 +339,7 @@ " \t\treturn c->llc_shared_map;\n" " }\n" "@@ -266,8 +266,8 @@\n" - " \t\t\t c[cpu].cpu_core_id == c[i].cpu_core_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, cpu_core_map[cpu]);\n" @@ -352,7 +352,7 @@ "@@ -279,7 +279,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\tcpu_core_map[cpu] = cpu_sibling_map[cpu];\n" "+\t\tper_cpu(cpu_core_map, cpu) = cpu_sibling_map[cpu];\n" " \t\tc[cpu].booted_cores = 1;\n" @@ -361,7 +361,7 @@ "@@ -291,8 +291,8 @@\n" " \t\t\tcpu_set(cpu, c[i].llc_shared_map);\n" " \t\t}\n" - " \t\tif (c[cpu].phys_proc_id == c[i].phys_proc_id) {\n" + " \t\tif (c[cpu].phys_proc_id = c[i].phys_proc_id) {\n" "-\t\t\tcpu_set(i, cpu_core_map[cpu]);\n" "-\t\t\tcpu_set(cpu, cpu_core_map[i]);\n" "+\t\t\tcpu_set(i, per_cpu(cpu_core_map, cpu));\n" @@ -434,4 +434,4 @@ "\n" -- -d5ed099e22773bd1b17a2d3a48f8158f18275f45c002f77a1971341ed0993f7f +61f03a2e87f9ce7c37f95d61fb95d1b0497d04f0b7e69caf5ac5fc698436bc86
diff --git a/a/content_digest b/N2/content_digest index af4f182..975415a 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,13 +3,14 @@ "Subject\0[PATCH 03/10] x86: Convert cpu_core_map to be a per cpu variable (v3)\0" "Date\0Tue, 11 Sep 2007 18:56:47 -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_core_map-to-per_cpu_data\0" "b\0" "This is from an earlier message from 'Christoph Lameter':\n" "\n" @@ -434,4 +435,4 @@ "\n" -- -d5ed099e22773bd1b17a2d3a48f8158f18275f45c002f77a1971341ed0993f7f +6fe683178975f75eb02cba96ed41b3c664f5192fb5c89dd8de71e86360949a73
diff --git a/a/1.txt b/N3/1.txt index eaa98dc..31eb4d8 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -419,4 +419,10 @@ Signed-off-by: Mike Travis <travis@sgi.com> #define mc_capable() (boot_cpu_data.x86_max_cores > 1) #define smt_capable() (smp_num_siblings > 1) +-- + -- +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 af4f182..0b7c08f 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -3,13 +3,14 @@ "Subject\0[PATCH 03/10] x86: Convert cpu_core_map to be a per cpu variable (v3)\0" "Date\0Tue, 11 Sep 2007 18:56:47 -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_core_map-to-per_cpu_data\0" "b\0" "This is from an earlier message from 'Christoph Lameter':\n" "\n" @@ -432,6 +433,12 @@ " #define mc_capable()\t\t\t(boot_cpu_data.x86_max_cores > 1)\n" " #define smt_capable() \t\t\t(smp_num_siblings > 1)\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>" -d5ed099e22773bd1b17a2d3a48f8158f18275f45c002f77a1971341ed0993f7f +6b6a1e1da36ee200b850da5ac77e69475af8189cc241c7152f1c388929f69a27
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.