diff options
author | Helge Deller <deller@gmx.de> | 2016-08-19 16:39:02 -0400 |
---|---|---|
committer | Helge Deller <deller@gmx.de> | 2016-08-20 07:33:51 -0400 |
commit | ae141830b118c3fb5b7eab6fa7c8ab7b7224b0a4 (patch) | |
tree | fd979258426d4387ef492955b03649118e84c5ef /arch/parisc/kernel/processor.c | |
parent | 6040e57658eee6eb1315a26119101ca832d1f854 (diff) |
parisc: Fix automatic selection of cr16 clocksource
Commit 54b66800907 (parisc: Add native high-resolution sched_clock()
implementation) added support to use the CPU-internal cr16 counters as reliable
clocksource with the help of HAVE_UNSTABLE_SCHED_CLOCK.
Sadly the commit missed to remove the hack which prevented cr16 to become the
default clocksource even on SMP systems.
Signed-off-by: Helge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org # 4.7+
Diffstat (limited to 'arch/parisc/kernel/processor.c')
-rw-r--r-- | arch/parisc/kernel/processor.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c index 5adc339eb7c8..0c2a94a0f751 100644 --- a/arch/parisc/kernel/processor.c +++ b/arch/parisc/kernel/processor.c | |||
@@ -51,8 +51,6 @@ EXPORT_SYMBOL(_parisc_requires_coherency); | |||
51 | 51 | ||
52 | DEFINE_PER_CPU(struct cpuinfo_parisc, cpu_data); | 52 | DEFINE_PER_CPU(struct cpuinfo_parisc, cpu_data); |
53 | 53 | ||
54 | extern int update_cr16_clocksource(void); /* from time.c */ | ||
55 | |||
56 | /* | 54 | /* |
57 | ** PARISC CPU driver - claim "device" and initialize CPU data structures. | 55 | ** PARISC CPU driver - claim "device" and initialize CPU data structures. |
58 | ** | 56 | ** |
@@ -228,12 +226,6 @@ static int processor_probe(struct parisc_device *dev) | |||
228 | } | 226 | } |
229 | #endif | 227 | #endif |
230 | 228 | ||
231 | /* If we've registered more than one cpu, | ||
232 | * we'll use the jiffies clocksource since cr16 | ||
233 | * is not synchronized between CPUs. | ||
234 | */ | ||
235 | update_cr16_clocksource(); | ||
236 | |||
237 | return 0; | 229 | return 0; |
238 | } | 230 | } |
239 | 231 | ||