diff options
| author | Helge Deller <deller@gmx.de> | 2018-01-12 22:44:00 +0100 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2018-03-02 10:04:59 +0100 |
| commit | 5ffa8518851f1401817c15d2a7eecc0373c26ff9 (patch) | |
| tree | 5b3a2783b111de3a4c69eaa8a57a463db14dfcee /arch/parisc | |
| parent | 0ed1fe4ad394e54783bbffa84102faf435661a2e (diff) | |
| download | op-kernel-dev-5ffa8518851f1401817c15d2a7eecc0373c26ff9.zip op-kernel-dev-5ffa8518851f1401817c15d2a7eecc0373c26ff9.tar.gz | |
parisc: Use cr16 interval timers unconditionally on qemu
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: Helge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org # 4.14+
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/include/asm/processor.h | 2 | ||||
| -rw-r--r-- | arch/parisc/kernel/time.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/processor.h b/arch/parisc/include/asm/processor.h index 0e6ab6e..2dbe558 100644 --- a/arch/parisc/include/asm/processor.h +++ b/arch/parisc/include/asm/processor.h @@ -316,6 +316,8 @@ extern int _parisc_requires_coherency; #define parisc_requires_coherency() (0) #endif +extern int running_on_qemu; + #endif /* __ASSEMBLY__ */ #endif /* __ASM_PARISC_PROCESSOR_H */ diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c index 4b8fd6d..68e88e5 100644 --- a/arch/parisc/kernel/time.c +++ b/arch/parisc/kernel/time.c @@ -248,7 +248,7 @@ static int __init init_cr16_clocksource(void) * different sockets, so mark them unstable and lower rating on * multi-socket SMP systems. */ - if (num_online_cpus() > 1) { + if (num_online_cpus() > 1 && !running_on_qemu) { int cpu; unsigned long cpu0_loc; cpu0_loc = per_cpu(cpu_data, 0).cpu_loc; |
