diff for duplicates of <20090528132023.GA29364@linux-sh.org> diff --git a/a/1.txt b/N1/1.txt index 24a0332..e3bf340 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,7 +13,7 @@ On Thu, May 28, 2009 at 02:59:30PM +0200, Peter Zijlstra wrote: > > > @@ -440,7 +444,17 @@ 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 Thu, May 28, 2009 at 02:59:30PM +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) > > + sched_clocksource = &clocksource_jiffies; > > + > > spin_unlock_irqrestore(&clocksource_lock, flags); @@ -126,7 +126,7 @@ index 80189f6..3795954 100644 /*[Clocksource internal variables]--------- * curr_clocksource: @@ -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) @@ -137,7 +137,7 @@ index 80189f6..3795954 100644 @@ -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(); @@ -147,7 +147,7 @@ index 80189f6..3795954 100644 + * 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 69b170b..64fe711 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -10,7 +10,7 @@ "ref\01243515570.6600.96.camel@laptop\0" "From\0Paul Mundt <lethal@linux-sh.org>\0" "Subject\0Re: [PATCH] sched: Support current clocksource handling in fallback sched_clock().\0" - "Date\0Thu, 28 May 2009 13:20:23 +0000\0" + "Date\0Thu, 28 May 2009 22:20:23 +0900\0" "To\0Peter Zijlstra <peterz@infradead.org>\0" "Cc\0Thomas Gleixner <tglx@linutronix.de>" Daniel Walker <dwalker@fifo99.com> @@ -40,7 +40,7 @@ "> \n" "> > @@ -440,7 +444,17 @@ 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" @@ -50,7 +50,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\tsched_clocksource = &clocksource_jiffies;\n" "> > +\n" "> > \tspin_unlock_irqrestore(&clocksource_lock, flags);\n" @@ -153,7 +153,7 @@ " /*[Clocksource internal variables]---------\n" " * curr_clocksource:\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" @@ -164,7 +164,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" @@ -174,7 +174,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" @@ -198,4 +198,4 @@ " \n" struct clocksource clocksource_jiffies = { -e4d17057d0a2406c1d548f1ba22c224e67a9ea7040d84774925d807765fb28b9 +4866754bc886651444bf082fa84b7cdb00f3d91ac51cad34bf8e0423b08c1ebc
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.