parisc: Fix automatic selection of cr16 clocksource (ae141830) · Commits · 戴 / test

arch/parisc/kernel/processor.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -51,8 +51,6 @@ EXPORT_SYMBOL(_parisc_requires_coherency);

		DEFINE_PER_CPU(struct cpuinfo_parisc, cpu_data);

		extern int update_cr16_clocksource(void); /* from time.c */

		/*
		** PARISC CPU driver - claim "device" and initialize CPU data structures.
		**
		@@ -228,12 +226,6 @@ static int processor_probe(struct parisc_device *dev)
		}
		#endif

		/* If we've registered more than one cpu,
		* we'll use the jiffies clocksource since cr16
		* is not synchronized between CPUs.
		*/
		update_cr16_clocksource();

		return 0;
		}

+0 −12

Original line number	Diff line number	Diff line
		@@ -221,18 +221,6 @@ static struct clocksource clocksource_cr16 = {
		.flags = CLOCK_SOURCE_IS_CONTINUOUS,
		};

		int update_cr16_clocksource(void)
		{
		/* since the cr16 cycle counters are not synchronized across CPUs,
		we'll check if we should switch to a safe clocksource: */
		if (clocksource_cr16.rating != 0 && num_online_cpus() > 1) {
		clocksource_change_rating(&clocksource_cr16, 0);
		return 1;
		}

		return 0;
		}

		void __init start_cpu_itimer(void)
		{
		unsigned int cpu = smp_processor_id();