diff for duplicates of <20050902144715.GA5207@in.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 65b42fd..1730f3b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,7 +9,7 @@ that John Hawke's has tested this on ia64 as well. The patch is here -http://marc.theaimsgroup.com/?l=linux-ia64&m\x112474434128996&w=2 +http://marc.theaimsgroup.com/?l=linux-ia64&m=112474434128996&w=2 Regards, @@ -105,7 +105,8 @@ On Mon, Aug 22, 2005 at 06:07:19PM +0200, Ingo Molnar wrote: > 7 files changed, 259 insertions(+), 489 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 @@ -117,7 +118,8 @@ On Mon, Aug 22, 2005 at 06:07:19PM +0200, Ingo Molnar wrote: > 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 @@ > -/* @@ -360,7 +362,7 @@ On Mon, Aug 22, 2005 at 06:07:19PM +0200, Ingo Molnar wrote: > - 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; > - } @@ -436,7 +438,7 @@ On Mon, Aug 22, 2005 at 06:07:19PM +0200, Ingo Molnar wrote: > - 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) { @@ -506,7 +508,7 @@ On Mon, Aug 22, 2005 at 06:07:19PM +0200, Ingo Molnar wrote: > - if (cpus_empty(nodemask)) > - continue; > - -> - if (sg = NULL) +> - if (sg == NULL) > - continue; > - sg = sg->next; > -next_sg: @@ -521,7 +523,8 @@ On Mon, Aug 22, 2005 at 06:07:19PM +0200, Ingo Molnar wrote: > -} > - > 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> @@ -534,7 +537,8 @@ On Mon, Aug 22, 2005 at 06:07:19PM +0200, Ingo Molnar wrote: > /* > * 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, \ @@ -566,7 +570,8 @@ On Mon, Aug 22, 2005 at 06:07:19PM +0200, Ingo Molnar wrote: > > #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 { > @@ -585,7 +590,8 @@ On Mon, Aug 22, 2005 at 06:07:19PM +0200, Ingo Molnar wrote: > * 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 @@ > } @@ -617,7 +623,8 @@ On Mon, Aug 22, 2005 at 06:07:19PM +0200, Ingo Molnar wrote: > #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 @@ -861,7 +868,7 @@ On Mon, Aug 22, 2005 at 06:07:19PM +0200, Ingo Molnar wrote: > + 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; > + } @@ -912,7 +919,7 @@ On Mon, Aug 22, 2005 at 06:07:19PM +0200, Ingo Molnar wrote: > 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; @@ -930,7 +937,7 @@ On Mon, Aug 22, 2005 at 06:07:19PM +0200, Ingo Molnar wrote: > + 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) { @@ -991,7 +998,7 @@ On Mon, Aug 22, 2005 at 06:07:19PM +0200, Ingo Molnar wrote: > + continue; > > -#endif /* ARCH_HAS_SCHED_DOMAIN */ -> + if (sg = NULL) +> + if (sg == NULL) > + continue; > + sg = sg->next; > +next_sg: diff --git a/a/content_digest b/N1/content_digest index 508f63e..8de5814 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\020050822160719.GB6652@elte.hu\0" "From\0Dinakar Guniguntala <dino@in.ibm.com>\0" "Subject\0Re: [PATCH] ia64 cpuset + build_sched_domains() mangles structures\0" - "Date\0Fri, 02 Sep 2005 14:59:15 +0000\0" + "Date\0Fri, 2 Sep 2005 20:17:15 +0530\0" "To\0Ingo Molnar <mingo@elte.hu>\0" "Cc\0John Hawkes <hawkes@jackhammer.engr.sgi.com>" linux-ia64@vger.kernel.org @@ -25,7 +25,7 @@ "\n" "The patch is here\n" "\n" - "http://marc.theaimsgroup.com/?l=linux-ia64&m\0212474434128996&w=2\n" + "http://marc.theaimsgroup.com/?l=linux-ia64&m=112474434128996&w=2\n" "\n" "\n" "Regards,\n" @@ -121,7 +121,8 @@ "> 7 files changed, 259 insertions(+), 489 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" @@ -133,7 +134,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" @@ -376,7 +378,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" @@ -452,7 +454,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" @@ -522,7 +524,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" @@ -537,7 +539,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" @@ -550,7 +553,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" @@ -582,7 +586,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" @@ -601,7 +606,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" @@ -633,7 +639,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" @@ -877,7 +884,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" @@ -928,7 +935,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" @@ -946,7 +953,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" @@ -1007,7 +1014,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" @@ -1031,4 +1038,4 @@ "> \n" > -5e35bd769cfd2cc8a8bbc6e8bc002c3d36104528baa6a0cdc3bf0b7a9209a9cc +863a89fff63cf478ee566f290e33b43412fbee1f244653e8c243b4f290808b4c
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.