aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/apic.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c
index 7bcd746d704c..0d935d218d0e 100644
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@ -547,7 +547,7 @@ calibrate_by_pmtimer(long deltapm, long *delta, long *deltatsc)
547 return -1; 547 return -1;
548#endif 548#endif
549 549
550 apic_printk(APIC_VERBOSE, "... PM timer delta = %ld\n", deltapm); 550 apic_printk(APIC_VERBOSE, "... PM-Timer delta = %ld\n", deltapm);
551 551
552 /* Check, if the PM timer is available */ 552 /* Check, if the PM timer is available */
553 if (!deltapm) 553 if (!deltapm)
@@ -557,14 +557,14 @@ calibrate_by_pmtimer(long deltapm, long *delta, long *deltatsc)
557 557
558 if (deltapm > (pm_100ms - pm_thresh) && 558 if (deltapm > (pm_100ms - pm_thresh) &&
559 deltapm < (pm_100ms + pm_thresh)) { 559 deltapm < (pm_100ms + pm_thresh)) {
560 apic_printk(APIC_VERBOSE, "... PM timer result ok\n"); 560 apic_printk(APIC_VERBOSE, "... PM-Timer result ok\n");
561 return 0; 561 return 0;
562 } 562 }
563 563
564 res = (((u64)deltapm) * mult) >> 22; 564 res = (((u64)deltapm) * mult) >> 22;
565 do_div(res, 1000000); 565 do_div(res, 1000000);
566 pr_warning("APIC calibration not consistent " 566 pr_warning("APIC calibration not consistent "
567 "with PM Timer: %ldms instead of 100ms\n",(long)res); 567 "with PM-Timer: %ldms instead of 100ms\n",(long)res);
568 568
569 /* Correct the lapic counter value */ 569 /* Correct the lapic counter value */
570 res = (((u64)(*delta)) * pm_100ms); 570 res = (((u64)(*delta)) * pm_100ms);