After clocksource_find_best() introduced, it is impossible to get into some code path. so clean them up.
Signed-off-by: Alex Shi <alex....@intel.com> --- kernel/time/clocksource.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index e713ef7..021c159 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c @@ -582,26 +582,12 @@ static void __clocksource_select(bool skipcur) if (!best) return; - /* Check for the override clocksource. */ list_for_each_entry(cs, &clocksource_list, list) { if (skipcur && cs == curr_clocksource) continue; if (strcmp(cs->name, override_name) != 0) continue; - /* - * Check to make sure we don't switch to a non-highres - * capable clocksource if the tick code is in oneshot - * mode (highres or nohz) - */ - if (!(cs->flags & CLOCK_SOURCE_VALID_FOR_HRES) && oneshot) { - /* Override clocksource cannot be used. */ - printk(KERN_WARNING "Override clocksource %s is not " - "HRT compatible. Cannot switch while in " - "HRT/NOHZ mode\n", cs->name); - override_name[0] = 0; - } else - /* Override clocksource can be used. */ - best = cs; + best = cs; break; } -- 1.7.12 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/