diff for duplicates of <20070912015646.388900350@sgi.com> diff --git a/a/1.txt b/N1/1.txt index 2a60f9e..17d07ab 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -45,8 +45,8 @@ Signed-off-by: Mike Travis <travis@sgi.com> int i; for (i = 0; i < NR_CPUS; i++) { -- if (x86_cpu_to_apicid[i] == apic_id) -+ if (per_cpu(x86_cpu_to_apicid, i) == apic_id) +- if (x86_cpu_to_apicid[i] = apic_id) ++ if (per_cpu(x86_cpu_to_apicid, i) = apic_id) return i; } return -1; @@ -56,8 +56,7 @@ Signed-off-by: Mike Travis <travis@sgi.com> struct cpuinfo_x86 cpu_data[NR_CPUS] __cacheline_aligned; EXPORT_SYMBOL(cpu_data); --u8 x86_cpu_to_apicid[NR_CPUS] __read_mostly = -- { [0 ... NR_CPUS-1] = 0xff }; +-u8 x86_cpu_to_apicid[NR_CPUS] __read_mostly - { [0 ... NR_CPUS-1] = 0xff }; -EXPORT_SYMBOL(x86_cpu_to_apicid); +/* + * The following static array is used during kernel startup @@ -65,8 +64,7 @@ Signed-off-by: Mike Travis <travis@sgi.com> + * array during this time. Is it zeroed when the per_cpu + * data area is removed. + */ -+u8 x86_cpu_to_apicid_init[NR_CPUS] __initdata = -+ { [0 ... NR_CPUS-1] = BAD_APICID }; ++u8 x86_cpu_to_apicid_init[NR_CPUS] __initdata + { [0 ... NR_CPUS-1] = BAD_APICID }; +void *x86_cpu_to_apicid_ptr; +DEFINE_PER_CPU(u8, x86_cpu_to_apicid) = BAD_APICID; +EXPORT_PER_CPU_SYMBOL(x86_cpu_to_apicid); @@ -97,7 +95,7 @@ Signed-off-by: Mike Travis <travis@sgi.com> - apicid = x86_cpu_to_apicid[cpu]; + apicid = per_cpu(x86_cpu_to_apicid, cpu); - if (apicid == BAD_APICID) { + if (apicid = BAD_APICID) { ret = -ENODEV; goto exit; @@ -965,7 +973,7 @@ @@ -166,8 +164,7 @@ Signed-off-by: Mike Travis <travis@sgi.com> + + for_each_cpu_mask(cpu, cpu_possible_map) { + if (per_cpu_offset(cpu)) -+ per_cpu(x86_cpu_to_apicid, cpu) = -+ x86_cpu_to_apicid_init[cpu]; ++ per_cpu(x86_cpu_to_apicid, cpu) + x86_cpu_to_apicid_init[cpu]; + } + + /* indicate the static array will be going away soon */ @@ -194,9 +191,9 @@ Signed-off-by: Mike Travis <travis@sgi.com> for (i = 0; i < NR_CPUS; i++) { - u8 apicid = x86_cpu_to_apicid[i]; + u8 apicid = x86_cpu_to_apicid_init[i]; - if (apicid == BAD_APICID) + if (apicid = BAD_APICID) continue; - if (apicid_to_node[apicid] == NUMA_NO_NODE) + if (apicid_to_node[apicid] = NUMA_NO_NODE) --- a/include/asm-i386/smp.h +++ b/include/asm-i386/smp.h @@ -39,9 +39,11 @@ diff --git a/a/content_digest b/N1/content_digest index 8944fb3..aaa5bfe 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 05/10] x86: Convert x86_cpu_to_apicid to be a per cpu variable (v3)\0" - "Date\0Tue, 11 Sep 2007 18:56:49 -0700\0" + "Date\0Wed, 12 Sep 2007 01:56:49 +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 patch converts the x86_cpu_to_apicid array to be a per\n" @@ -58,8 +58,8 @@ " \tint i;\n" " \n" " \tfor (i = 0; i < NR_CPUS; i++) {\n" - "-\t\tif (x86_cpu_to_apicid[i] == apic_id)\n" - "+\t\tif (per_cpu(x86_cpu_to_apicid, i) == apic_id)\n" + "-\t\tif (x86_cpu_to_apicid[i] = apic_id)\n" + "+\t\tif (per_cpu(x86_cpu_to_apicid, i) = apic_id)\n" " \t\t\treturn i;\n" " \t}\n" " \treturn -1;\n" @@ -69,8 +69,7 @@ " struct cpuinfo_x86 cpu_data[NR_CPUS] __cacheline_aligned;\n" " EXPORT_SYMBOL(cpu_data);\n" " \n" - "-u8 x86_cpu_to_apicid[NR_CPUS] __read_mostly =\n" - "-\t\t\t{ [0 ... NR_CPUS-1] = 0xff };\n" + "-u8 x86_cpu_to_apicid[NR_CPUS] __read_mostly -\t\t\t{ [0 ... NR_CPUS-1] = 0xff };\n" "-EXPORT_SYMBOL(x86_cpu_to_apicid);\n" "+/*\n" "+ * The following static array is used during kernel startup\n" @@ -78,8 +77,7 @@ "+ * array during this time. Is it zeroed when the per_cpu\n" "+ * data area is removed.\n" "+ */\n" - "+u8 x86_cpu_to_apicid_init[NR_CPUS] __initdata =\n" - "+\t\t\t{ [0 ... NR_CPUS-1] = BAD_APICID };\n" + "+u8 x86_cpu_to_apicid_init[NR_CPUS] __initdata +\t\t\t{ [0 ... NR_CPUS-1] = BAD_APICID };\n" "+void *x86_cpu_to_apicid_ptr;\n" "+DEFINE_PER_CPU(u8, x86_cpu_to_apicid) = BAD_APICID;\n" "+EXPORT_PER_CPU_SYMBOL(x86_cpu_to_apicid);\n" @@ -110,7 +108,7 @@ " \n" "-\tapicid = x86_cpu_to_apicid[cpu];\n" "+\tapicid = per_cpu(x86_cpu_to_apicid, cpu);\n" - " \tif (apicid == BAD_APICID) {\n" + " \tif (apicid = BAD_APICID) {\n" " \t\tret = -ENODEV;\n" " \t\tgoto exit;\n" "@@ -965,7 +973,7 @@\n" @@ -179,8 +177,7 @@ "+\n" "+\tfor_each_cpu_mask(cpu, cpu_possible_map) {\n" "+\t\tif (per_cpu_offset(cpu))\n" - "+\t\t\tper_cpu(x86_cpu_to_apicid, cpu) =\n" - "+\t\t\t\t\t\tx86_cpu_to_apicid_init[cpu];\n" + "+\t\t\tper_cpu(x86_cpu_to_apicid, cpu) +\t\t\t\t\t\tx86_cpu_to_apicid_init[cpu];\n" "+\t}\n" "+\n" "+\t/* indicate the static array will be going away soon */\n" @@ -207,9 +204,9 @@ " \tfor (i = 0; i < NR_CPUS; i++) {\n" "-\t\tu8 apicid = x86_cpu_to_apicid[i];\n" "+\t\tu8 apicid = x86_cpu_to_apicid_init[i];\n" - " \t\tif (apicid == BAD_APICID)\n" + " \t\tif (apicid = BAD_APICID)\n" " \t\t\tcontinue;\n" - " \t\tif (apicid_to_node[apicid] == NUMA_NO_NODE)\n" + " \t\tif (apicid_to_node[apicid] = NUMA_NO_NODE)\n" "--- a/include/asm-i386/smp.h\n" "+++ b/include/asm-i386/smp.h\n" "@@ -39,9 +39,11 @@\n" @@ -312,4 +309,4 @@ "\n" -- -8ed8d10ad09916ba364ecbdef504ea70475af8a4e2bff91025cd252719e2e419 +f0ba0d0096b26263a34b3951f60f6eac2811398975a2f7675e2f0570e2eba8a1
diff --git a/a/content_digest b/N2/content_digest index 8944fb3..3866e0c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,13 +3,14 @@ "Subject\0[PATCH 05/10] x86: Convert x86_cpu_to_apicid to be a per cpu variable (v3)\0" "Date\0Tue, 11 Sep 2007 18:56:49 -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-x86_cpu_to_apicid-to-per_cpu_data\0" "b\0" "This patch converts the x86_cpu_to_apicid array to be a per\n" "cpu variable. This saves sizeof(apicid) * NR unused cpus.\n" @@ -312,4 +313,4 @@ "\n" -- -8ed8d10ad09916ba364ecbdef504ea70475af8a4e2bff91025cd252719e2e419 +af0ad6f695d74b413a26127e5ee8f17979bc2dc6e60a4442a8967757f097306b
diff --git a/a/1.txt b/N3/1.txt index 2a60f9e..6bc041d 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -297,4 +297,10 @@ Signed-off-by: Mike Travis <travis@sgi.com> /* * Initialize the ACPI boot-time table parser (gets the RSDP and SDT). +-- + -- +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 8944fb3..c038614 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -3,13 +3,14 @@ "Subject\0[PATCH 05/10] x86: Convert x86_cpu_to_apicid to be a per cpu variable (v3)\0" "Date\0Tue, 11 Sep 2007 18:56:49 -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-x86_cpu_to_apicid-to-per_cpu_data\0" "b\0" "This patch converts the x86_cpu_to_apicid array to be a per\n" "cpu variable. This saves sizeof(apicid) * NR unused cpus.\n" @@ -310,6 +311,12 @@ " \t/*\n" " \t * Initialize the ACPI boot-time table parser (gets the RSDP and SDT).\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>" -8ed8d10ad09916ba364ecbdef504ea70475af8a4e2bff91025cd252719e2e419 +9730d53c1b5ee5adbecc6853822eead41dc7af6951e87ba8c671199402805031
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.