diff options
| author |   Jiang, Yunhong <yunhong.jiang@intel.com> | 2016-10-28 23:29:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-28 23:29:15 +0000 |
| commit | ff067418f34c3670cbab67587d8ab0dc0c8f1acc (patch) | |
| tree | 5991abe90fad967bfed0638d9d979777f70f3df3 /kernel/arch/x86/kernel/tsc.c | |
| parent | f2e379228d244be691bee350da1cb3d820cb6dfb (diff) | |
| parent | ab1366e1b48fa0b56752a3b56e7456c3c7ecb011 (diff) | |
Merge "Inform TSC deadline clockevent device about recalibration"
Diffstat (limited to 'kernel/arch/x86/kernel/tsc.c')
| -rw-r--r-- | kernel/arch/x86/kernel/tsc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/arch/x86/kernel/tsc.c b/kernel/arch/x86/kernel/tsc.c index c7c4d9c51..eafe93888 100644 --- a/kernel/arch/x86/kernel/tsc.c +++ b/kernel/arch/x86/kernel/tsc.c @@ -22,6 +22,7 @@ #include <asm/nmi.h> #include <asm/x86_init.h> #include <asm/geode.h> +#include <asm/apic.h> unsigned int __read_mostly cpu_khz; /* TSC clocks / usec, not used here */ EXPORT_SYMBOL(cpu_khz); @@ -1141,6 +1142,9 @@ static void tsc_refine_calibration_work(struct work_struct *work) (unsigned long)tsc_khz / 1000, (unsigned long)tsc_khz % 1000); + /* Inform the TSC deadline clockevent devices about the recalibration */ + lapic_update_tsc_freq(); + out: clocksource_register_khz(&clocksource_tsc, tsc_khz); } |