Skip to content

Commit 7962c08

Browse files
committed
Revert "parisc: Mark sched_clock unstable only if clocks are not syncronized"
This reverts commit d97180a. It triggers RCU stalls at boot with a 32-bit kernel. Signed-off-by: Helge Deller <deller@gmx.de> Noticed-by: John David Anglin <dave.anglin@bell.net> Cc: stable@vger.kernel.org # v5.15+
1 parent 9dc4241 commit 7962c08

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

arch/parisc/kernel/setup.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ void __init setup_arch(char **cmdline_p)
161161
#ifdef CONFIG_PA11
162162
dma_ops_init();
163163
#endif
164+
165+
clear_sched_clock_stable();
164166
}
165167

166168
/*

arch/parisc/kernel/time.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,16 +267,17 @@ static int __init init_cr16_clocksource(void)
267267
(cpu0_loc == per_cpu(cpu_data, cpu).cpu_loc))
268268
continue;
269269

270-
/* mark sched_clock unstable */
271-
clear_sched_clock_stable();
272-
273270
clocksource_cr16.name = "cr16_unstable";
274271
clocksource_cr16.flags = CLOCK_SOURCE_UNSTABLE;
275272
clocksource_cr16.rating = 0;
276273
break;
277274
}
278275
}
279276

277+
/* XXX: We may want to mark sched_clock stable here if cr16 clocks are
278+
* in sync:
279+
* (clocksource_cr16.flags == CLOCK_SOURCE_IS_CONTINUOUS) */
280+
280281
/* register at clocksource framework */
281282
clocksource_register_hz(&clocksource_cr16,
282283
100 * PAGE0->mem_10msec);

0 commit comments

Comments
 (0)