diff for duplicates of <20050822070834.GA16722@elte.hu> diff --git a/a/1.txt b/N1/1.txt index 1e6f4da..8a3f9cf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -88,7 +88,8 @@ Signed-off-by: Ingo Molnar <mingo@elte.hu> 7 files changed, 260 insertions(+), 490 deletions(-) Index: linux-sched-curr/arch/ia64/kernel/Makefile -=================================--- linux-sched-curr.orig/arch/ia64/kernel/Makefile +=================================================================== +--- linux-sched-curr.orig/arch/ia64/kernel/Makefile +++ linux-sched-curr/arch/ia64/kernel/Makefile @@ -16,7 +16,7 @@ obj-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += acp obj-$(CONFIG_IA64_PALINFO) += palinfo.o @@ -100,7 +101,8 @@ Index: linux-sched-curr/arch/ia64/kernel/Makefile obj-$(CONFIG_PERFMON) += perfmon_default_smpl.o obj-$(CONFIG_IA64_CYCLONE) += cyclone.o Index: linux-sched-curr/arch/ia64/kernel/domain.c -=================================--- linux-sched-curr.orig/arch/ia64/kernel/domain.c +=================================================================== +--- linux-sched-curr.orig/arch/ia64/kernel/domain.c +++ /dev/null @@ -1,400 +0,0 @@ -/* @@ -343,7 +345,7 @@ Index: linux-sched-curr/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; - } @@ -419,7 +421,7 @@ Index: linux-sched-curr/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) { @@ -489,7 +491,7 @@ Index: linux-sched-curr/arch/ia64/kernel/domain.c - if (cpus_empty(nodemask)) - continue; - -- if (sg = NULL) +- if (sg == NULL) - continue; - sg = sg->next; -next_sg: @@ -504,7 +506,8 @@ Index: linux-sched-curr/arch/ia64/kernel/domain.c -} - Index: linux-sched-curr/include/asm-ia64/processor.h -=================================--- linux-sched-curr.orig/include/asm-ia64/processor.h +=================================================================== +--- linux-sched-curr.orig/include/asm-ia64/processor.h +++ linux-sched-curr/include/asm-ia64/processor.h @@ -20,9 +20,6 @@ #include <asm/ptrace.h> @@ -517,7 +520,8 @@ Index: linux-sched-curr/include/asm-ia64/processor.h /* * Limits for PMC and PMD are set to less than maximum architected values Index: linux-sched-curr/include/asm-ia64/topology.h -=================================--- linux-sched-curr.orig/include/asm-ia64/topology.h +=================================================================== +--- linux-sched-curr.orig/include/asm-ia64/topology.h +++ linux-sched-curr/include/asm-ia64/topology.h @@ -96,28 +96,6 @@ void build_cpu_to_node_map(void); .nr_balance_failed = 0, \ @@ -549,7 +553,8 @@ Index: linux-sched-curr/include/asm-ia64/topology.h #include <asm-generic/topology.h> Index: linux-sched-curr/include/linux/sched.h -=================================--- linux-sched-curr.orig/include/linux/sched.h +=================================================================== +--- linux-sched-curr.orig/include/linux/sched.h +++ linux-sched-curr/include/linux/sched.h @@ -546,15 +546,6 @@ struct sched_domain { @@ -568,7 +573,8 @@ Index: linux-sched-curr/include/linux/sched.h * Maximum cache size the migration-costs auto-tuning code will * search from: Index: linux-sched-curr/include/linux/topology.h -=================================--- linux-sched-curr.orig/include/linux/topology.h +=================================================================== +--- linux-sched-curr.orig/include/linux/topology.h +++ linux-sched-curr/include/linux/topology.h @@ -133,6 +133,28 @@ } @@ -600,7 +606,8 @@ Index: linux-sched-curr/include/linux/topology.h #ifndef SD_NODE_INIT #error Please define an appropriate SD_NODE_INIT in include/asm/topology.h!!! Index: linux-sched-curr/kernel/sched.c -=================================--- linux-sched-curr.orig/kernel/sched.c +=================================================================== +--- linux-sched-curr.orig/kernel/sched.c +++ linux-sched-curr/kernel/sched.c @@ -4947,7 +4947,7 @@ static int sd_parent_degenerate(struct s * Attach the domain 'sd' to 'cpu' as its base domain. Callers must @@ -844,7 +851,7 @@ Index: linux-sched-curr/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; + } @@ -895,7 +902,7 @@ Index: linux-sched-curr/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; @@ -913,7 +920,7 @@ Index: linux-sched-curr/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) { @@ -977,7 +984,7 @@ Index: linux-sched-curr/kernel/sched.c + if (cpus_empty(nodemask)) + continue; + -+ if (sg = NULL) ++ if (sg == NULL) + continue; + sg = sg->next; +next_sg: diff --git a/a/content_digest b/N1/content_digest index 1c0e66f..5a77707 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\043074328.MailOXV1UXUHF@jackhammer.engr.sgi.com\0" "From\0Ingo Molnar <mingo@elte.hu>\0" "Subject\0Re: [PATCH] ia64 cpuset + build_sched_domains() mangles structures\0" - "Date\0Mon, 22 Aug 2005 07:08:34 +0000\0" + "Date\0Mon, 22 Aug 2005 09:08:34 +0200\0" "To\0John Hawkes <hawkes@jackhammer.engr.sgi.com>\0" "Cc\0linux-ia64@vger.kernel.org" linux-kernel@vger.kernel.org @@ -101,7 +101,8 @@ " 7 files changed, 260 insertions(+), 490 deletions(-)\n" "\n" "Index: linux-sched-curr/arch/ia64/kernel/Makefile\n" - "=================================--- linux-sched-curr.orig/arch/ia64/kernel/Makefile\n" + "===================================================================\n" + "--- linux-sched-curr.orig/arch/ia64/kernel/Makefile\n" "+++ linux-sched-curr/arch/ia64/kernel/Makefile\n" "@@ -16,7 +16,7 @@ obj-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += acp\n" " obj-$(CONFIG_IA64_PALINFO)\t+= palinfo.o\n" @@ -113,7 +114,8 @@ " obj-$(CONFIG_PERFMON)\t\t+= perfmon_default_smpl.o\n" " obj-$(CONFIG_IA64_CYCLONE)\t+= cyclone.o\n" "Index: linux-sched-curr/arch/ia64/kernel/domain.c\n" - "=================================--- linux-sched-curr.orig/arch/ia64/kernel/domain.c\n" + "===================================================================\n" + "--- linux-sched-curr.orig/arch/ia64/kernel/domain.c\n" "+++ /dev/null\n" "@@ -1,400 +0,0 @@\n" "-/*\n" @@ -356,7 +358,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" @@ -432,7 +434,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" @@ -502,7 +504,7 @@ "-\t\tif (cpus_empty(nodemask))\n" "-\t\t\tcontinue;\n" "-\n" - "-\t\tif (sg = NULL)\n" + "-\t\tif (sg == NULL)\n" "-\t\t\tcontinue;\n" "-\t\tsg = sg->next;\n" "-next_sg:\n" @@ -517,7 +519,8 @@ "-}\n" "-\n" "Index: linux-sched-curr/include/asm-ia64/processor.h\n" - "=================================--- linux-sched-curr.orig/include/asm-ia64/processor.h\n" + "===================================================================\n" + "--- linux-sched-curr.orig/include/asm-ia64/processor.h\n" "+++ linux-sched-curr/include/asm-ia64/processor.h\n" "@@ -20,9 +20,6 @@\n" " #include <asm/ptrace.h>\n" @@ -530,7 +533,8 @@ " /*\n" " * Limits for PMC and PMD are set to less than maximum architected values\n" "Index: linux-sched-curr/include/asm-ia64/topology.h\n" - "=================================--- linux-sched-curr.orig/include/asm-ia64/topology.h\n" + "===================================================================\n" + "--- linux-sched-curr.orig/include/asm-ia64/topology.h\n" "+++ linux-sched-curr/include/asm-ia64/topology.h\n" "@@ -96,28 +96,6 @@ void build_cpu_to_node_map(void);\n" " \t.nr_balance_failed\t= 0,\t\t\t\\\n" @@ -562,7 +566,8 @@ " \n" " #include <asm-generic/topology.h>\n" "Index: linux-sched-curr/include/linux/sched.h\n" - "=================================--- linux-sched-curr.orig/include/linux/sched.h\n" + "===================================================================\n" + "--- linux-sched-curr.orig/include/linux/sched.h\n" "+++ linux-sched-curr/include/linux/sched.h\n" "@@ -546,15 +546,6 @@ struct sched_domain {\n" " \n" @@ -581,7 +586,8 @@ " * Maximum cache size the migration-costs auto-tuning code will\n" " * search from:\n" "Index: linux-sched-curr/include/linux/topology.h\n" - "=================================--- linux-sched-curr.orig/include/linux/topology.h\n" + "===================================================================\n" + "--- linux-sched-curr.orig/include/linux/topology.h\n" "+++ linux-sched-curr/include/linux/topology.h\n" "@@ -133,6 +133,28 @@\n" " }\n" @@ -613,7 +619,8 @@ " #ifndef SD_NODE_INIT\n" " #error Please define an appropriate SD_NODE_INIT in include/asm/topology.h!!!\n" "Index: linux-sched-curr/kernel/sched.c\n" - "=================================--- linux-sched-curr.orig/kernel/sched.c\n" + "===================================================================\n" + "--- linux-sched-curr.orig/kernel/sched.c\n" "+++ linux-sched-curr/kernel/sched.c\n" "@@ -4947,7 +4947,7 @@ static int sd_parent_degenerate(struct s\n" " * Attach the domain 'sd' to 'cpu' as its base domain. Callers must\n" @@ -857,7 +864,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" @@ -908,7 +915,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" @@ -926,7 +933,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" @@ -990,7 +997,7 @@ "+\t\tif (cpus_empty(nodemask))\n" "+\t\t\tcontinue;\n" "+\n" - "+\t\tif (sg = NULL)\n" + "+\t\tif (sg == NULL)\n" "+\t\t\tcontinue;\n" "+\t\tsg = sg->next;\n" "+next_sg:\n" @@ -1007,4 +1014,4 @@ " /*\n" * Detach sched domains from a group of cpus specified in cpu_map -2f94f99a55e0d61d3ddc350a54391a073d44239c343587d2c1dde1e64ccd1ee6 +f9b08d55c9e552ffc00a9c57570f78d2ce199a9724581a59956cc862b5acd970
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.