diff for duplicates of <1311180177.29152.57.camel@twins> diff --git a/a/1.txt b/N1/1.txt index 77e9d90..6411fb8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,11 +1,10 @@ On Wed, 2011-07-20 at 09:04 -0700, Linus Torvalds wrote: -> On Wed, Jul 20, 2011 at 7:58 AM, Peter Zijlstra <a.p.zijlstra@chello.nl> = -wrote: +> On Wed, Jul 20, 2011 at 7:58 AM, Peter Zijlstra <a.p.zijlstra@chello.nl> wrote: > > > > Right, so we can either merge my scary patches now and have 3.0 boot on > > 16+ node machines (and risk breaking something), or delay them until > > 3.0.1 and have 16+ node machines suffer a little. ->=20 +> > So how much impact does your scary patch have on machines that don't > have multiple nodes? If it's a "the code isn't even called by normal > machines" kind of setup, I don't think I care a lot. @@ -36,17 +35,15 @@ Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> 1 file changed, 2 insertions(+) Index: linux-2.6/kernel/sched.c -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +=================================================================== --- linux-2.6.orig/kernel/sched.c +++ linux-2.6/kernel/sched.c @@ -7436,6 +7436,8 @@ static int build_sched_domains(const str - sd =3D build_sched_domain(tl, &d, cpu_map, attr, sd, i); + sd = build_sched_domain(tl, &d, cpu_map, attr, sd, i); if (tl->flags & SDTL_OVERLAP || sched_feat(FORCE_SD_OVERLAP)) - sd->flags |=3D SD_OVERLAP; + sd->flags |= SD_OVERLAP; + if (cpumask_equal(cpu_map, sched_domain_span(sd))) + break; } -=20 + while (sd->child) diff --git a/a/content_digest b/N1/content_digest index 22c7675..fced630 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -17,21 +17,21 @@ "Subject\0Re: [regression] 3.0-rc boot failure -- bisected to cd4ea6ae3982\0" "Date\0Wed, 20 Jul 2011 18:42:57 +0200\0" "To\0Linus Torvalds <torvalds@linux-foundation.org>\0" - "Cc\0mahesh@linux.vnet.ibm.com" + "Cc\0Anton Blanchard <anton@samba.org>" + mahesh@linux.vnet.ibm.com linux-kernel@vger.kernel.org - Anton Blanchard <anton@samba.org> + linuxppc-dev@lists.ozlabs.org mingo@elte.hu - " linuxppc-dev@lists.ozlabs.org\0" + " benh@kernel.crashing.org\0" "\00:1\0" "b\0" "On Wed, 2011-07-20 at 09:04 -0700, Linus Torvalds wrote:\n" - "> On Wed, Jul 20, 2011 at 7:58 AM, Peter Zijlstra <a.p.zijlstra@chello.nl> =\n" - "wrote:\n" + "> On Wed, Jul 20, 2011 at 7:58 AM, Peter Zijlstra <a.p.zijlstra@chello.nl> wrote:\n" "> >\n" "> > Right, so we can either merge my scary patches now and have 3.0 boot on\n" "> > 16+ node machines (and risk breaking something), or delay them until\n" "> > 3.0.1 and have 16+ node machines suffer a little.\n" - ">=20\n" + "> \n" "> So how much impact does your scary patch have on machines that don't\n" "> have multiple nodes? If it's a \"the code isn't even called by normal\n" "> machines\" kind of setup, I don't think I care a lot.\n" @@ -62,19 +62,17 @@ " 1 file changed, 2 insertions(+)\n" "\n" "Index: linux-2.6/kernel/sched.c\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n" + "===================================================================\n" "--- linux-2.6.orig/kernel/sched.c\n" "+++ linux-2.6/kernel/sched.c\n" "@@ -7436,6 +7436,8 @@ static int build_sched_domains(const str\n" - " \t\t\tsd =3D build_sched_domain(tl, &d, cpu_map, attr, sd, i);\n" + " \t\t\tsd = build_sched_domain(tl, &d, cpu_map, attr, sd, i);\n" " \t\t\tif (tl->flags & SDTL_OVERLAP || sched_feat(FORCE_SD_OVERLAP))\n" - " \t\t\t\tsd->flags |=3D SD_OVERLAP;\n" + " \t\t\t\tsd->flags |= SD_OVERLAP;\n" "+\t\t\tif (cpumask_equal(cpu_map, sched_domain_span(sd)))\n" "+\t\t\t\tbreak;\n" " \t\t}\n" - "=20\n" + " \n" " \t\twhile (sd->child)" -e47241785c38a1e16d4b0868b6aa9951f7adc3b30f2a236df33692428d1a40f2 +8efb075d7153a43f2b80e877f056a8a348c956a8039d687a6cd505e9681885bd
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.