Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79bedcb0 authored by Helge Deller's avatar Helge Deller Committed by Greg Kroah-Hartman
Browse files

parisc: Use cr16 interval timers unconditionally on qemu 



commit 5ffa8518851f1401817c15d2a7eecc0373c26ff9 upstream.

When running on qemu we know that the (emulated) cr16 cpu-internal
clocks are syncronized. So let's use them unconditionally on qemu.

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org # 4.14+
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 32810f94

arch/parisc/include/asm/processor.h

+2 −0
Original line number Diff line number Diff line
@@ -323,6 +323,8 @@ extern int _parisc_requires_coherency; 
#define parisc_requires_coherency()	(0)

#endif



extern int running_on_qemu;



#endif /* __ASSEMBLY__ */



#endif /* __ASM_PARISC_PROCESSOR_H */

arch/parisc/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ static int __init init_cr16_clocksource(void) 
	 * The cr16 interval timers are not syncronized across CPUs, so mark

	 * them unstable and lower rating on SMP systems.

	 */

	if (num_online_cpus() > 1) {

	if (num_online_cpus() > 1 && !running_on_qemu) {

		clocksource_cr16.flags = CLOCK_SOURCE_UNSTABLE;

		clocksource_cr16.rating = 0;

	}