Merge airlied/drm-next into drm-misc-next

Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index e41af597aed8..37e7cf544e51 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -1356,6 +1356,9 @@ void __init tsc_init(void)
                 (unsigned long)cpu_khz / 1000,
                 (unsigned long)cpu_khz % 1000);
 
+        /* Sanitize TSC ADJUST before cyc2ns gets initialized */
+        tsc_store_and_check_tsc_adjust(true);
+
         /*
          * Secondary CPUs do not run through tsc_init(), so set up
          * all the scale factors for all CPUs, assuming the same
@@ -1386,8 +1389,6 @@ void __init tsc_init(void)
 
         if (unsynchronized_tsc())
                 mark_tsc_unstable("TSCs unsynchronized");
-        else
-                tsc_store_and_check_tsc_adjust(true);
 
         check_system_tsc_reliable();