Commit 7962c089 authored by Helge Deller's avatar Helge Deller
Browse files

Revert "parisc: Mark sched_clock unstable only if clocks are not syncronized" 



This reverts commit d97180ad.

It triggers RCU stalls at boot with a 32-bit kernel.

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Noticed-by: default avatarJohn David Anglin <dave.anglin@bell.net>
Cc: stable@vger.kernel.org # v5.15+
parent 9dc4241b

arch/parisc/kernel/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -161,6 +161,8 @@ void __init setup_arch(char **cmdline_p) 
#ifdef CONFIG_PA11

	dma_ops_init();

#endif



	clear_sched_clock_stable();

}



/*

arch/parisc/kernel/time.c

+4 −3
Original line number Diff line number Diff line
@@ -267,9 +267,6 @@ static int __init init_cr16_clocksource(void) 
			    (cpu0_loc == per_cpu(cpu_data, cpu).cpu_loc))

				continue;



			/* mark sched_clock unstable */

			clear_sched_clock_stable();



			clocksource_cr16.name = "cr16_unstable";

			clocksource_cr16.flags = CLOCK_SOURCE_UNSTABLE;

			clocksource_cr16.rating = 0;
@@ -277,6 +274,10 @@ static int __init init_cr16_clocksource(void) 
		}

	}



	/* XXX: We may want to mark sched_clock stable here if cr16 clocks are

	 *	in sync:

	 *	(clocksource_cr16.flags == CLOCK_SOURCE_IS_CONTINUOUS) */



	/* register at clocksource framework */

	clocksource_register_hz(&clocksource_cr16,

		100 * PAGE0->mem_10msec);