Clayton Craft
dc3499fa98
- depend on diffutils, or else make complains about options not supported by busybox diff - rebased patches [ci:skip-build]: already built successfully in CI
45 lines
1.2 KiB
Diff
45 lines
1.2 KiB
Diff
From d3703752d08f5aeee686781a34f865da018e510a Mon Sep 17 00:00:00 2001
|
|
From: Steven Noonan <steven@uplinklabs.net>
|
|
Date: Wed, 17 Nov 2021 11:55:18 -0800
|
|
Subject: [PATCH 11/21] x86: touch clocksource watchdog after syncing TSCs
|
|
|
|
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
|
|
[Forward port to 6.5]
|
|
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
|
|
---
|
|
arch/x86/kernel/smpboot.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
|
|
index b5a8f0891135..6af1092a792c 100644
|
|
--- a/arch/x86/kernel/smpboot.c
|
|
+++ b/arch/x86/kernel/smpboot.c
|
|
@@ -61,6 +61,7 @@
|
|
#include <linux/cpuhotplug.h>
|
|
#include <linux/mc146818rtc.h>
|
|
#include <linux/acpi.h>
|
|
+#include <linux/clocksource.h>
|
|
|
|
#include <asm/acpi.h>
|
|
#include <asm/cacheinfo.h>
|
|
@@ -1122,6 +1123,7 @@ void arch_thaw_secondary_cpus_begin(void)
|
|
|
|
void arch_thaw_secondary_cpus_end(void)
|
|
{
|
|
+ clocksource_touch_watchdog();
|
|
cache_aps_init();
|
|
}
|
|
|
|
@@ -1143,6 +1145,8 @@ void __init native_smp_cpus_done(unsigned int max_cpus)
|
|
{
|
|
pr_debug("Boot done\n");
|
|
|
|
+ clocksource_touch_watchdog();
|
|
+
|
|
build_sched_topology();
|
|
nmi_selftest();
|
|
impress_friends();
|
|
--
|
|
2.48.1
|
|
|