diff for duplicates of <20090602073515.GB17710@linux-sh.org> diff --git a/a/1.txt b/N1/1.txt index 40b6915..2d9c328 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ On Tue, Jun 02, 2009 at 09:25:02AM +0200, Peter Zijlstra wrote: > On Tue, 2009-06-02 at 16:17 +0900, Paul Mundt wrote: > > > @@ -362,6 +364,9 @@ static struct clocksource *select_clocksource(void) -> > if (next = curr_clocksource) +> > if (next == curr_clocksource) > > return NULL; > > > > + if (next->flags & CLOCK_SOURCE_USE_FOR_SCHED_CLOCK) @@ -13,7 +13,7 @@ On Tue, Jun 02, 2009 at 09:25:02AM +0200, Peter Zijlstra wrote: > > > > @@ -440,7 +445,21 @@ void clocksource_unregister(struct clocksource *cs) > > list_del(&cs->list); -> > if (clocksource_override = cs) +> > if (clocksource_override == cs) > > clocksource_override = NULL; > > + > > next_clocksource = select_clocksource(); @@ -23,7 +23,7 @@ On Tue, Jun 02, 2009 at 09:25:02AM +0200, Peter Zijlstra wrote: > > + * clocksource for sched_clocksource and we are unregistering > > + * it, switch back to jiffies. > > + */ -> > + if (sched_clocksource = cs) { +> > + if (sched_clocksource == cs) { > > + rcu_assign_pointer(sched_clocksource, &clocksource_jiffies); > > + spin_unlock_irqrestore(&clocksource_lock, flags); > > + synchronize_rcu(); diff --git a/a/content_digest b/N1/content_digest index f5c7e42..dd659d3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01243927502.23657.5619.camel@twins\0" "From\0Paul Mundt <lethal@linux-sh.org>\0" "Subject\0Re: [PATCH] sched: sched_clock() clocksource handling.\0" - "Date\0Tue, 02 Jun 2009 07:35:15 +0000\0" + "Date\0Tue, 2 Jun 2009 16:35:15 +0900\0" "To\0Peter Zijlstra <peterz@infradead.org>\0" "Cc\0Ingo Molnar <mingo@elte.hu>" Thomas Gleixner <tglx@linutronix.de> @@ -21,7 +21,7 @@ "> On Tue, 2009-06-02 at 16:17 +0900, Paul Mundt wrote:\n" "> \n" "> > @@ -362,6 +364,9 @@ static struct clocksource *select_clocksource(void)\n" - "> > \tif (next = curr_clocksource)\n" + "> > \tif (next == curr_clocksource)\n" "> > \t\treturn NULL;\n" "> > \n" "> > +\tif (next->flags & CLOCK_SOURCE_USE_FOR_SCHED_CLOCK)\n" @@ -32,7 +32,7 @@ "> > \n" "> > @@ -440,7 +445,21 @@ void clocksource_unregister(struct clocksource *cs)\n" "> > \tlist_del(&cs->list);\n" - "> > \tif (clocksource_override = cs)\n" + "> > \tif (clocksource_override == cs)\n" "> > \t\tclocksource_override = NULL;\n" "> > +\n" "> > \tnext_clocksource = select_clocksource();\n" @@ -42,7 +42,7 @@ "> > +\t * clocksource for sched_clocksource and we are unregistering\n" "> > +\t * it, switch back to jiffies.\n" "> > +\t */\n" - "> > +\tif (sched_clocksource = cs) {\n" + "> > +\tif (sched_clocksource == cs) {\n" "> > +\t\trcu_assign_pointer(sched_clocksource, &clocksource_jiffies);\n" "> > +\t\tspin_unlock_irqrestore(&clocksource_lock, flags);\n" "> > +\t\tsynchronize_rcu();\n" @@ -78,4 +78,4 @@ "rcu_assign_pointer() then presumably all of the unlock paths that do\n" select_clocksource() will have to synchronize_rcu()? -c2e99461d7c48bc476dd24d70025a695fd3fe83b4bd430d3df4db111f045ac55 +ab8ad4dd66fcbbd0fc97b2d97c670f64e88993bfd6f2c1579c8d2bd114f16ac7
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.