diff for duplicates of <20090602071718.GA17710@linux-sh.org> diff --git a/a/1.txt b/N1/1.txt index ec8c227..c5f869f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -116,7 +116,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) @@ -127,7 +127,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(); @@ -137,7 +137,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 584f50b..9a01e94 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Paul Mundt <lethal@linux-sh.org>\0" "Subject\0[PATCH] sched: sched_clock() clocksource handling.\0" - "Date\0Tue, 02 Jun 2009 07:17:18 +0000\0" + "Date\0Tue, 2 Jun 2009 16:17:18 +0900\0" "To\0Ingo Molnar <mingo@elte.hu>\0" "Cc\0Peter Zijlstra <peterz@infradead.org>" Thomas Gleixner <tglx@linutronix.de> @@ -133,7 +133,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" @@ -144,7 +144,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" @@ -154,7 +154,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" @@ -178,4 +178,4 @@ " \n" struct clocksource clocksource_jiffies = { -dba49d0dcbeefd6096946a76ea85e04faeb52994619e27da5081f9483ff0d968 +326d6ba8b54330f19fef6b0c5c553db2ae23a21c0068edfa99cbe3f9bb61582b
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.