Some platforms will not set the override clocksource name to select, so we
can skip to check the override clocksource when selecting one clocksource.

Signed-off-by: Baolin Wang <baolin.w...@linaro.org>
---
 kernel/time/clocksource.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index 65f9e3f..c5fdcb1 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -594,6 +594,9 @@ static void __clocksource_select(bool skipcur)
        if (!best)
                return;
 
+       if (!strlen(override_name))
+               goto found;
+
        /* Check for the override clocksource. */
        list_for_each_entry(cs, &clocksource_list, list) {
                if (skipcur && cs == curr_clocksource)
@@ -625,6 +628,7 @@ static void __clocksource_select(bool skipcur)
                break;
        }
 
+found:
        if (curr_clocksource != best && !timekeeping_notify(best)) {
                pr_info("Switched to clocksource %s\n", best->name);
                curr_clocksource = best;
-- 
1.7.9.5

Reply via email to