diff for duplicates of <4A65B0AB.5000608@kernel.org> diff --git a/a/1.txt b/N1/1.txt index a50e483..f5fa157 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,8 +33,7 @@ Thanks. 4 files changed, 161 insertions(+), 15 deletions(-) Index: work/arch/ia64/Kconfig -=================================================================== ---- work.orig/arch/ia64/Kconfig +=================================--- work.orig/arch/ia64/Kconfig +++ work/arch/ia64/Kconfig @@ -89,9 +89,6 @@ config GENERIC_TIME_VSYSCALL bool @@ -47,8 +46,7 @@ Index: work/arch/ia64/Kconfig def_bool y Index: work/arch/ia64/mm/contig.c -=================================================================== ---- work.orig/arch/ia64/mm/contig.c +=================================--- work.orig/arch/ia64/mm/contig.c +++ work/arch/ia64/mm/contig.c @@ -186,6 +186,73 @@ alloc_per_cpu_data(void) cpu_data = __alloc_bootmem(PERCPU_PAGE_SIZE * NR_CPUS-1, @@ -125,8 +123,7 @@ Index: work/arch/ia64/mm/contig.c #define alloc_per_cpu_data() do { } while (0) #endif /* CONFIG_SMP */ Index: work/arch/ia64/mm/discontig.c -=================================================================== ---- work.orig/arch/ia64/mm/discontig.c +=================================--- work.orig/arch/ia64/mm/discontig.c +++ work/arch/ia64/mm/discontig.c @@ -159,6 +159,100 @@ static void *per_cpu_node_setup(void *cp return cpu_data; @@ -171,9 +168,9 @@ Index: work/arch/ia64/mm/discontig.c + cpu_map[unit++] = 0; + for_each_node(node) { + for_each_possible_cpu(cpu) { -+ if (cpu == 0) ++ if (cpu = 0) + continue; -+ if (node == node_cpuid[cpu].nid) ++ if (node = node_cpuid[cpu].nid) + cpu_map[unit++] = cpu; + } + } @@ -206,7 +203,7 @@ Index: work/arch/ia64/mm/discontig.c + unsigned int cpu = cpu_map[unit]; + + node = node_cpuid[cpu].nid; -+ if (node == prev_node) { ++ if (node = prev_node) { + gi->nr_units++; + continue; + } @@ -230,8 +227,7 @@ Index: work/arch/ia64/mm/discontig.c * fill_pernode - initialize pernode data. * @node: the node id. Index: work/arch/ia64/kernel/setup.c -=================================================================== ---- work.orig/arch/ia64/kernel/setup.c +=================================--- work.orig/arch/ia64/kernel/setup.c +++ work/arch/ia64/kernel/setup.c @@ -856,18 +856,6 @@ identify_cpu (struct cpuinfo_ia64 *c) } diff --git a/a/content_digest b/N1/content_digest index 757b4af..37807e8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Tejun Heo <tj@kernel.org>\0" "Subject\0[RFC PATCH] ia64: convert to dynamic percpu allocator\0" - "Date\0Tue, 21 Jul 2009 21:12:27 +0900\0" + "Date\0Tue, 21 Jul 2009 12:12:27 +0000\0" "To\0Tony Luck <tony.luck@intel.com>" Fenghua Yu <fenghua.yu@intel.com> lkml <linux-kernel@vger.kernel.org> @@ -43,8 +43,7 @@ " 4 files changed, 161 insertions(+), 15 deletions(-)\n" "\n" "Index: work/arch/ia64/Kconfig\n" - "===================================================================\n" - "--- work.orig/arch/ia64/Kconfig\n" + "=================================--- work.orig/arch/ia64/Kconfig\n" "+++ work/arch/ia64/Kconfig\n" "@@ -89,9 +89,6 @@ config GENERIC_TIME_VSYSCALL\n" " \tbool\n" @@ -57,8 +56,7 @@ " \tdef_bool y\n" " \n" "Index: work/arch/ia64/mm/contig.c\n" - "===================================================================\n" - "--- work.orig/arch/ia64/mm/contig.c\n" + "=================================--- work.orig/arch/ia64/mm/contig.c\n" "+++ work/arch/ia64/mm/contig.c\n" "@@ -186,6 +186,73 @@ alloc_per_cpu_data(void)\n" " \tcpu_data = __alloc_bootmem(PERCPU_PAGE_SIZE * NR_CPUS-1,\n" @@ -135,8 +133,7 @@ " #define alloc_per_cpu_data() do { } while (0)\n" " #endif /* CONFIG_SMP */\n" "Index: work/arch/ia64/mm/discontig.c\n" - "===================================================================\n" - "--- work.orig/arch/ia64/mm/discontig.c\n" + "=================================--- work.orig/arch/ia64/mm/discontig.c\n" "+++ work/arch/ia64/mm/discontig.c\n" "@@ -159,6 +159,100 @@ static void *per_cpu_node_setup(void *cp\n" " \treturn cpu_data;\n" @@ -181,9 +178,9 @@ "+\tcpu_map[unit++] = 0;\n" "+\tfor_each_node(node) {\n" "+\t\tfor_each_possible_cpu(cpu) {\n" - "+\t\t\tif (cpu == 0)\n" + "+\t\t\tif (cpu = 0)\n" "+\t\t\t\tcontinue;\n" - "+\t\t\tif (node == node_cpuid[cpu].nid)\n" + "+\t\t\tif (node = node_cpuid[cpu].nid)\n" "+\t\t\t\tcpu_map[unit++] = cpu;\n" "+\t\t}\n" "+\t}\n" @@ -216,7 +213,7 @@ "+\t\tunsigned int cpu = cpu_map[unit];\n" "+\n" "+\t\tnode = node_cpuid[cpu].nid;\n" - "+\t\tif (node == prev_node) {\n" + "+\t\tif (node = prev_node) {\n" "+\t\t\tgi->nr_units++;\n" "+\t\t\tcontinue;\n" "+\t\t}\n" @@ -240,8 +237,7 @@ " * fill_pernode - initialize pernode data.\n" " * @node: the node id.\n" "Index: work/arch/ia64/kernel/setup.c\n" - "===================================================================\n" - "--- work.orig/arch/ia64/kernel/setup.c\n" + "=================================--- work.orig/arch/ia64/kernel/setup.c\n" "+++ work/arch/ia64/kernel/setup.c\n" "@@ -856,18 +856,6 @@ identify_cpu (struct cpuinfo_ia64 *c)\n" " }\n" @@ -263,4 +259,4 @@ " *\n" * 1. the max. cache line size. -d91450492bbb5845d069e3d2587ac31c3b011fbb49e75b7d1888b122873be593 +719d6611c34261dcacaac6980d68cef218206d6e08f7bc71b9abb582b5c1695b
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.