Commit-ID:  4c5e3c63752162262c42424147f319b8571a20af
Gitweb:     http://git.kernel.org/tip/4c5e3c63752162262c42424147f319b8571a20af
Author:     Thomas Gleixner <[email protected]>
AuthorDate: Sat, 19 Nov 2016 13:47:40 +0000
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Tue, 29 Nov 2016 19:23:18 +0100

x86/tsc: Move sync cleanup to a safe place

Cleaning up the stop marker on the control CPU is wrong when we want to add
retry support. Move the cleanup to the starting CPU.

Signed-off-by: Thomas Gleixner <[email protected]>
Reviewed-by: Ingo Molnar <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Yinghai Lu <[email protected]>
Cc: Borislav Petkov <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Thomas Gleixner <[email protected]>

---
 arch/x86/kernel/tsc_sync.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c
index fdb3b7b..8f394eeb 100644
--- a/arch/x86/kernel/tsc_sync.c
+++ b/arch/x86/kernel/tsc_sync.c
@@ -267,11 +267,6 @@ void check_tsc_sync_source(int cpu)
        }
 
        /*
-        * Reset it - in case this is a second bootup:
-        */
-       atomic_set(&stop_count, 0);
-
-       /*
         * Wait for the target to start or to skip the test:
         */
        while (atomic_read(&start_count) != cpus - 1) {
@@ -360,6 +355,11 @@ void check_tsc_sync_target(void)
         */
        while (atomic_read(&stop_count) != cpus)
                cpu_relax();
+
+       /*
+        * Reset it for the next sync test:
+        */
+       atomic_set(&stop_count, 0);
 }
 
 #endif /* CONFIG_SMP */

Reply via email to