diff for duplicates of <4AC2B33E.6000902@suse.de> diff --git a/a/1.txt b/N1/1.txt index 802cb7f..41ec5c9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -80,7 +80,7 @@ index 1341437..351da0a 100644 - if (first_time) { - void *cpu0_data = __cpu0_per_cpu; + for (cpu = 0; cpu < NR_CPUS; cpu++) { -+ void *src = cpu = 0 ? cpu0_data : __phys_per_cpu_start; ++ void *src = cpu == 0 ? cpu0_data : __phys_per_cpu_start; - first_time=0; + memcpy(cpu_data, src, __per_cpu_end - __per_cpu_start); @@ -98,7 +98,7 @@ index 1341437..351da0a 100644 + * percpu areas which is important for congruent + * percpu allocator. + */ -+ if (cpu = 0) ++ if (cpu == 0) + ia64_set_kr(IA64_KR_PER_CPU_DATA, __pa(cpu_data) - + (unsigned long)__per_cpu_start); @@ -130,18 +130,18 @@ index 9f24b3c..200282b 100644 int cpu; for_each_possible_early_cpu(cpu) { -- if (cpu = 0) { +- if (cpu == 0) { - void *cpu0_data = __cpu0_per_cpu; - __per_cpu_offset[cpu] = (char*)cpu0_data - - __per_cpu_start; -- } else if (node = node_cpuid[cpu].nid) { +- } else if (node == node_cpuid[cpu].nid) { - memcpy(__va(cpu_data), __phys_per_cpu_start, - __per_cpu_end - __per_cpu_start); - __per_cpu_offset[cpu] = (char*)__va(cpu_data) - - __per_cpu_start; - cpu_data += PERCPU_PAGE_SIZE; - } -+ void *src = cpu = 0 ? __cpu0_per_cpu : __phys_per_cpu_start; ++ void *src = cpu == 0 ? __cpu0_per_cpu : __phys_per_cpu_start; + + if (node != node_cpuid[cpu].nid) + continue; @@ -159,7 +159,7 @@ index 9f24b3c..200282b 100644 + * percpu areas which is important for congruent + * percpu allocator. + */ -+ if (cpu = 0) ++ if (cpu == 0) + ia64_set_kr(IA64_KR_PER_CPU_DATA, + (unsigned long)cpu_data - + (unsigned long)__per_cpu_start); diff --git a/a/content_digest b/N1/content_digest index 6b8b047..7d67aa4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01253682382-24740-1-git-send-email-tj@kernel.org\0" "From\0Tejun Heo <teheo@suse.de>\0" - "Subject\0[PATCH REPOST 3/5] ia64: allocate percpu area for cpu0 like percpu\0" - "Date\0Wed, 30 Sep 2009 01:24:14 +0000\0" + "Subject\0[PATCH REPOST 3/5] ia64: allocate percpu area for cpu0 like percpu areas for other cpus\0" + "Date\0Wed, 30 Sep 2009 10:24:14 +0900\0" "To\0Nick Piggin <npiggin@suse.de>" Tony Luck <tony.luck@intel.com> Fenghua Yu <fenghua.yu@intel.com> @@ -94,7 +94,7 @@ "-\tif (first_time) {\n" "-\t\tvoid *cpu0_data = __cpu0_per_cpu;\n" "+\tfor (cpu = 0; cpu < NR_CPUS; cpu++) {\n" - "+\t\tvoid *src = cpu = 0 ? cpu0_data : __phys_per_cpu_start;\n" + "+\t\tvoid *src = cpu == 0 ? cpu0_data : __phys_per_cpu_start;\n" "\n" "-\t\tfirst_time=0;\n" "+\t\tmemcpy(cpu_data, src, __per_cpu_end - __per_cpu_start);\n" @@ -112,7 +112,7 @@ "+\t\t * percpu areas which is important for congruent\n" "+\t\t * percpu allocator.\n" "+\t\t */\n" - "+\t\tif (cpu = 0)\n" + "+\t\tif (cpu == 0)\n" "+\t\t\tia64_set_kr(IA64_KR_PER_CPU_DATA, __pa(cpu_data) -\n" "+\t\t\t\t (unsigned long)__per_cpu_start);\n" "\n" @@ -144,18 +144,18 @@ " \tint cpu;\n" "\n" " \tfor_each_possible_early_cpu(cpu) {\n" - "-\t\tif (cpu = 0) {\n" + "-\t\tif (cpu == 0) {\n" "-\t\t\tvoid *cpu0_data = __cpu0_per_cpu;\n" "-\t\t\t__per_cpu_offset[cpu] = (char*)cpu0_data -\n" "-\t\t\t\t__per_cpu_start;\n" - "-\t\t} else if (node = node_cpuid[cpu].nid) {\n" + "-\t\t} else if (node == node_cpuid[cpu].nid) {\n" "-\t\t\tmemcpy(__va(cpu_data), __phys_per_cpu_start,\n" "-\t\t\t __per_cpu_end - __per_cpu_start);\n" "-\t\t\t__per_cpu_offset[cpu] = (char*)__va(cpu_data) -\n" "-\t\t\t\t__per_cpu_start;\n" "-\t\t\tcpu_data += PERCPU_PAGE_SIZE;\n" "-\t\t}\n" - "+\t\tvoid *src = cpu = 0 ? __cpu0_per_cpu : __phys_per_cpu_start;\n" + "+\t\tvoid *src = cpu == 0 ? __cpu0_per_cpu : __phys_per_cpu_start;\n" "+\n" "+\t\tif (node != node_cpuid[cpu].nid)\n" "+\t\t\tcontinue;\n" @@ -173,7 +173,7 @@ "+\t\t * percpu areas which is important for congruent\n" "+\t\t * percpu allocator.\n" "+\t\t */\n" - "+\t\tif (cpu = 0)\n" + "+\t\tif (cpu == 0)\n" "+\t\t\tia64_set_kr(IA64_KR_PER_CPU_DATA,\n" "+\t\t\t\t (unsigned long)cpu_data -\n" "+\t\t\t\t (unsigned long)__per_cpu_start);\n" @@ -185,4 +185,4 @@ "-- \n" 1.6.4.2 -a8dfe8b980965be837a91c5f75e5cf3bcbd5816449fcc45654fa2d15d2f0a4e8 +1261874bef99d06d985bf22d981e1e96c1c3b71c7534659e207414938a47a690
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.