diff for duplicates of <20050902201014.9693.98774.sendpatchset@jackhammer.engr.sgi.com> diff --git a/a/1.txt b/N1/1.txt index 8cb1bc4..239a721 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,7 +9,8 @@ Signed-off-by: John Hawkes <hawkes@sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Index: linux/arch/ia64/kernel/Makefile -=================================--- linux.orig/arch/ia64/kernel/Makefile 2005-09-02 08:56:02.000000000 -0700 +=================================================================== +--- linux.orig/arch/ia64/kernel/Makefile 2005-09-02 08:56:02.000000000 -0700 +++ linux/arch/ia64/kernel/Makefile 2005-09-02 10:46:27.000000000 -0700 @@ -16,7 +16,7 @@ obj-$(CONFIG_IA64_PALINFO) += palinfo.o @@ -21,7 +22,8 @@ Index: linux/arch/ia64/kernel/Makefile obj-$(CONFIG_PERFMON) += perfmon_default_smpl.o obj-$(CONFIG_IA64_CYCLONE) += cyclone.o Index: linux/include/asm-ia64/processor.h -=================================--- linux.orig/include/asm-ia64/processor.h 2005-08-28 16:41:01.000000000 -0700 +=================================================================== +--- linux.orig/include/asm-ia64/processor.h 2005-08-28 16:41:01.000000000 -0700 +++ linux/include/asm-ia64/processor.h 2005-09-02 10:46:27.000000000 -0700 @@ -20,9 +20,6 @@ #include <asm/ptrace.h> @@ -34,7 +36,8 @@ Index: linux/include/asm-ia64/processor.h /* * Limits for PMC and PMD are set to less than maximum architected values Index: linux/include/linux/topology.h -=================================--- linux.orig/include/linux/topology.h 2005-08-28 16:41:01.000000000 -0700 +=================================================================== +--- linux.orig/include/linux/topology.h 2005-08-28 16:41:01.000000000 -0700 +++ linux/include/linux/topology.h 2005-09-02 10:53:17.000000000 -0700 @@ -135,6 +135,29 @@ } @@ -67,7 +70,8 @@ Index: linux/include/linux/topology.h #ifndef SD_NODE_INIT #error Please define an appropriate SD_NODE_INIT in include/asm/topology.h!!! Index: linux/kernel/sched.c -=================================--- linux.orig/kernel/sched.c 2005-09-02 08:56:51.000000000 -0700 +=================================================================== +--- linux.orig/kernel/sched.c 2005-09-02 08:56:51.000000000 -0700 +++ linux/kernel/sched.c 2005-09-02 10:46:27.000000000 -0700 @@ -5114,7 +5114,7 @@ * Attach the domain 'sd' to 'cpu' as its base domain. Callers must @@ -311,7 +315,7 @@ Index: linux/kernel/sched.c + struct sched_domain *sd; + sd = &per_cpu(node_domains, j); + sd->groups = sg; -+ if (sd->groups = NULL) { ++ if (sd->groups == NULL) { + /* Turn off balancing if we have no groups */ + sd->flags = 0; + } @@ -362,7 +366,7 @@ Index: linux/kernel/sched.c sd->groups->cpu_power = power; #ifdef CONFIG_NUMA -- if (i = first_cpu(sd->groups->cpumask)) { +- if (i == first_cpu(sd->groups->cpumask)) { - /* Only add "power" once for each physical package. */ - sd = &per_cpu(node_domains, i); - sd->groups->cpu_power += power; @@ -380,7 +384,7 @@ Index: linux/kernel/sched.c + struct sched_group *sg = sched_group_nodes[i]; + int j; + -+ if (sg = NULL) ++ if (sg == NULL) + continue; +next_sg: + for_each_cpu_mask(j, sg->cpumask) { @@ -441,7 +445,7 @@ Index: linux/kernel/sched.c + continue; -#endif /* ARCH_HAS_SCHED_DOMAIN */ -+ if (sg = NULL) ++ if (sg == NULL) + continue; + sg = sg->next; +next_sg: @@ -458,7 +462,8 @@ Index: linux/kernel/sched.c /* * Detach sched domains from a group of cpus specified in cpu_map Index: linux/arch/ia64/kernel/domain.c -=================================--- linux.orig/arch/ia64/kernel/domain.c 2005-09-02 10:45:06.000000000 -0700 +=================================================================== +--- linux.orig/arch/ia64/kernel/domain.c 2005-09-02 10:45:06.000000000 -0700 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,444 +0,0 @@ -/* @@ -732,7 +737,7 @@ Index: linux/arch/ia64/kernel/domain.c - struct sched_domain *sd; - sd = &per_cpu(node_domains, j); - sd->groups = sg; -- if (sd->groups = NULL) { +- if (sd->groups == NULL) { - /* Turn off balancing if we have no groups */ - sd->flags = 0; - } @@ -808,7 +813,7 @@ Index: linux/arch/ia64/kernel/domain.c - struct sched_group *sg = sched_group_nodes[i]; - int j; - -- if (sg = NULL) +- if (sg == NULL) - continue; -next_sg: - for_each_cpu_mask(j, sg->cpumask) { @@ -890,7 +895,7 @@ Index: linux/arch/ia64/kernel/domain.c - if (cpus_empty(nodemask)) - continue; - -- if (sg = NULL) +- if (sg == NULL) - continue; - sg = sg->next; -next_sg: @@ -906,7 +911,8 @@ Index: linux/arch/ia64/kernel/domain.c -#endif -} Index: linux/include/linux/sched.h -=================================--- linux.orig/include/linux/sched.h 2005-09-02 08:56:45.000000000 -0700 +=================================================================== +--- linux.orig/include/linux/sched.h 2005-09-02 08:56:45.000000000 -0700 +++ linux/include/linux/sched.h 2005-09-02 10:47:08.000000000 -0700 @@ -600,13 +600,6 @@ @@ -923,7 +929,8 @@ Index: linux/include/linux/sched.h Index: linux/include/asm-ia64/topology.h -=================================--- linux.orig/include/asm-ia64/topology.h 2005-08-28 16:41:01.000000000 -0700 +=================================================================== +--- linux.orig/include/asm-ia64/topology.h 2005-08-28 16:41:01.000000000 -0700 +++ linux/include/asm-ia64/topology.h 2005-09-02 10:48:01.000000000 -0700 @@ -98,29 +98,6 @@ .nr_balance_failed = 0, \ diff --git a/a/content_digest b/N1/content_digest index e8e9376..cff2eb3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0hawkes@sgi.com\0" "Subject\0[PATCH 1/3] 2.6.13-mm1: cpuset + build_sched_domains() fix\0" - "Date\0Fri, 02 Sep 2005 20:10:14 +0000\0" + "Date\0Fri, 2 Sep 2005 13:10:14 -0700 (PDT)\0" "To\0Dinakar Guniguntala <dino@in.ibm.com>" Andrew Morton <akpm@osdl.org> " Ingo Molnar <mingo@elte.hu>\0" @@ -22,7 +22,8 @@ "Signed-off-by: Ingo Molnar <mingo@elte.hu>\n" "\n" "Index: linux/arch/ia64/kernel/Makefile\n" - "=================================--- linux.orig/arch/ia64/kernel/Makefile\t2005-09-02 08:56:02.000000000 -0700\n" + "===================================================================\n" + "--- linux.orig/arch/ia64/kernel/Makefile\t2005-09-02 08:56:02.000000000 -0700\n" "+++ linux/arch/ia64/kernel/Makefile\t2005-09-02 10:46:27.000000000 -0700\n" "@@ -16,7 +16,7 @@\n" " obj-$(CONFIG_IA64_PALINFO)\t+= palinfo.o\n" @@ -34,7 +35,8 @@ " obj-$(CONFIG_PERFMON)\t\t+= perfmon_default_smpl.o\n" " obj-$(CONFIG_IA64_CYCLONE)\t+= cyclone.o\n" "Index: linux/include/asm-ia64/processor.h\n" - "=================================--- linux.orig/include/asm-ia64/processor.h\t2005-08-28 16:41:01.000000000 -0700\n" + "===================================================================\n" + "--- linux.orig/include/asm-ia64/processor.h\t2005-08-28 16:41:01.000000000 -0700\n" "+++ linux/include/asm-ia64/processor.h\t2005-09-02 10:46:27.000000000 -0700\n" "@@ -20,9 +20,6 @@\n" " #include <asm/ptrace.h>\n" @@ -47,7 +49,8 @@ " /*\n" " * Limits for PMC and PMD are set to less than maximum architected values\n" "Index: linux/include/linux/topology.h\n" - "=================================--- linux.orig/include/linux/topology.h\t2005-08-28 16:41:01.000000000 -0700\n" + "===================================================================\n" + "--- linux.orig/include/linux/topology.h\t2005-08-28 16:41:01.000000000 -0700\n" "+++ linux/include/linux/topology.h\t2005-09-02 10:53:17.000000000 -0700\n" "@@ -135,6 +135,29 @@\n" " }\n" @@ -80,7 +83,8 @@ " #ifndef SD_NODE_INIT\n" " #error Please define an appropriate SD_NODE_INIT in include/asm/topology.h!!!\n" "Index: linux/kernel/sched.c\n" - "=================================--- linux.orig/kernel/sched.c\t2005-09-02 08:56:51.000000000 -0700\n" + "===================================================================\n" + "--- linux.orig/kernel/sched.c\t2005-09-02 08:56:51.000000000 -0700\n" "+++ linux/kernel/sched.c\t2005-09-02 10:46:27.000000000 -0700\n" "@@ -5114,7 +5114,7 @@\n" " * Attach the domain 'sd' to 'cpu' as its base domain. Callers must\n" @@ -324,7 +328,7 @@ "+\t\t\tstruct sched_domain *sd;\n" "+\t\t\tsd = &per_cpu(node_domains, j);\n" "+\t\t\tsd->groups = sg;\n" - "+\t\t\tif (sd->groups = NULL) {\n" + "+\t\t\tif (sd->groups == NULL) {\n" "+\t\t\t\t/* Turn off balancing if we have no groups */\n" "+\t\t\t\tsd->flags = 0;\n" "+\t\t\t}\n" @@ -375,7 +379,7 @@ " \t\tsd->groups->cpu_power = power;\n" " \n" " #ifdef CONFIG_NUMA\n" - "-\t\tif (i = first_cpu(sd->groups->cpumask)) {\n" + "-\t\tif (i == first_cpu(sd->groups->cpumask)) {\n" "-\t\t\t/* Only add \"power\" once for each physical package. */\n" "-\t\t\tsd = &per_cpu(node_domains, i);\n" "-\t\t\tsd->groups->cpu_power += power;\n" @@ -393,7 +397,7 @@ "+\t\tstruct sched_group *sg = sched_group_nodes[i];\n" "+\t\tint j;\n" "+\n" - "+\t\tif (sg = NULL)\n" + "+\t\tif (sg == NULL)\n" "+\t\t\tcontinue;\n" "+next_sg:\n" "+\t\tfor_each_cpu_mask(j, sg->cpumask) {\n" @@ -454,7 +458,7 @@ "+\t\t\tcontinue;\n" " \n" "-#endif /* ARCH_HAS_SCHED_DOMAIN */\n" - "+\t\tif (sg = NULL)\n" + "+\t\tif (sg == NULL)\n" "+\t\t\tcontinue;\n" "+\t\tsg = sg->next;\n" "+next_sg:\n" @@ -471,7 +475,8 @@ " /*\n" " * Detach sched domains from a group of cpus specified in cpu_map\n" "Index: linux/arch/ia64/kernel/domain.c\n" - "=================================--- linux.orig/arch/ia64/kernel/domain.c\t2005-09-02 10:45:06.000000000 -0700\n" + "===================================================================\n" + "--- linux.orig/arch/ia64/kernel/domain.c\t2005-09-02 10:45:06.000000000 -0700\n" "+++ /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" "@@ -1,444 +0,0 @@\n" "-/*\n" @@ -745,7 +750,7 @@ "-\t\t\tstruct sched_domain *sd;\n" "-\t\t\tsd = &per_cpu(node_domains, j);\n" "-\t\t\tsd->groups = sg;\n" - "-\t\t\tif (sd->groups = NULL) {\n" + "-\t\t\tif (sd->groups == NULL) {\n" "-\t\t\t\t/* Turn off balancing if we have no groups */\n" "-\t\t\t\tsd->flags = 0;\n" "-\t\t\t}\n" @@ -821,7 +826,7 @@ "-\t\tstruct sched_group *sg = sched_group_nodes[i];\n" "-\t\tint j;\n" "-\n" - "-\t\tif (sg = NULL)\n" + "-\t\tif (sg == NULL)\n" "-\t\t\tcontinue;\n" "-next_sg:\n" "-\t\tfor_each_cpu_mask(j, sg->cpumask) {\n" @@ -903,7 +908,7 @@ "-\t\t\tif (cpus_empty(nodemask))\n" "-\t\t\t\tcontinue;\n" "-\n" - "-\t\t\tif (sg = NULL)\n" + "-\t\t\tif (sg == NULL)\n" "-\t\t\t\tcontinue;\n" "-\t\t\tsg = sg->next;\n" "-next_sg:\n" @@ -919,7 +924,8 @@ "-#endif\n" "-}\n" "Index: linux/include/linux/sched.h\n" - "=================================--- linux.orig/include/linux/sched.h\t2005-09-02 08:56:45.000000000 -0700\n" + "===================================================================\n" + "--- linux.orig/include/linux/sched.h\t2005-09-02 08:56:45.000000000 -0700\n" "+++ linux/include/linux/sched.h\t2005-09-02 10:47:08.000000000 -0700\n" "@@ -600,13 +600,6 @@\n" " \n" @@ -936,7 +942,8 @@ " \n" " \n" "Index: linux/include/asm-ia64/topology.h\n" - "=================================--- linux.orig/include/asm-ia64/topology.h\t2005-08-28 16:41:01.000000000 -0700\n" + "===================================================================\n" + "--- linux.orig/include/asm-ia64/topology.h\t2005-08-28 16:41:01.000000000 -0700\n" "+++ linux/include/asm-ia64/topology.h\t2005-09-02 10:48:01.000000000 -0700\n" "@@ -98,29 +98,6 @@\n" " \t.nr_balance_failed\t= 0,\t\t\t\\\n" @@ -969,4 +976,4 @@ " \n" #include <asm-generic/topology.h> -1e511f9f3b3e24bb40b26b5e80df63e822539ecc1262384b10150b2bcc1ff59c +c9a507f171f403b0a298c004bde56567bed0da1096d8871c9300372f95c2f24b
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.