aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2016-06-03 13:22:31 -0400
committerHelge Deller <deller@gmx.de>2016-06-05 02:45:09 -0400
commit0032c08833ab7c7861d12eb35da26dce85f3e229 (patch)
tree5ba1addbdefee1ec09b4a3fcf2e1d2fd6cc9acfe /arch/parisc
parentbe24a89700eef61bedaba40f3b05ef07f5806e38 (diff)
parisc: Fix printk time during boot
Avoid showing invalid printk time stamps during boot. Signed-off-by: Helge Deller <deller@gmx.de> Reviewed-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Diffstat (limited to 'arch/parisc')
-rw-r--r--arch/parisc/kernel/processor.c5
-rw-r--r--arch/parisc/kernel/time.c5
2 files changed, 3 insertions, 7 deletions
diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c
index e81ccf1716e9..5adc339eb7c8 100644
--- a/arch/parisc/kernel/processor.c
+++ b/arch/parisc/kernel/processor.c
@@ -324,8 +324,9 @@ int init_per_cpu(int cpunum)
324 per_cpu(cpu_data, cpunum).fp_rev = coproc_cfg.revision; 324 per_cpu(cpu_data, cpunum).fp_rev = coproc_cfg.revision;
325 per_cpu(cpu_data, cpunum).fp_model = coproc_cfg.model; 325 per_cpu(cpu_data, cpunum).fp_model = coproc_cfg.model;
326 326
327 printk(KERN_INFO "FP[%d] enabled: Rev %ld Model %ld\n", 327 if (cpunum == 0)
328 cpunum, coproc_cfg.revision, coproc_cfg.model); 328 printk(KERN_INFO "FP[%d] enabled: Rev %ld Model %ld\n",
329 cpunum, coproc_cfg.revision, coproc_cfg.model);
329 330
330 /* 331 /*
331 ** store status register to stack (hopefully aligned) 332 ** store status register to stack (hopefully aligned)
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index 58dd6801f5be..31ec99a5f119 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -309,11 +309,6 @@ void __init time_init(void)
309 clocks_calc_mult_shift(&cyc2ns_mul, &cyc2ns_shift, current_cr16_khz, 309 clocks_calc_mult_shift(&cyc2ns_mul, &cyc2ns_shift, current_cr16_khz,
310 NSEC_PER_MSEC, 0); 310 NSEC_PER_MSEC, 0);
311 311
312#if defined(CONFIG_HAVE_UNSTABLE_SCHED_CLOCK) && defined(CONFIG_64BIT)
313 /* At bootup only one 64bit CPU is online and cr16 is "stable" */
314 set_sched_clock_stable();
315#endif
316
317 start_cpu_itimer(); /* get CPU 0 started */ 312 start_cpu_itimer(); /* get CPU 0 started */
318 313
319 /* register at clocksource framework */ 314 /* register at clocksource framework */