diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 13:36:48 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 13:36:48 -0500 |
| commit | 43a834d86c136b31ef6ad796725eb474a55a908d (patch) | |
| tree | 973db568aa41089f8d160982a850bec32c801c72 /arch/x86/kernel/apic/apic.c | |
| parent | a7f16d10b510f9ee3500af7831f2e3094fab3dca (diff) | |
| parent | 3235dc3f22378f35ce77eba0d0f62db2d9c4844e (diff) | |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Remove trailing spaces in messages
x86, mtrr: Remove unused mtrr/state.c
x86, trivial: Fix grammo in tsc comment about Geode TSC reliability
Diffstat (limited to 'arch/x86/kernel/apic/apic.c')
| -rw-r--r-- | arch/x86/kernel/apic/apic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index dfca210f6a10..6e29b2a77aa8 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c | |||
| @@ -581,7 +581,7 @@ calibrate_by_pmtimer(long deltapm, long *delta, long *deltatsc) | |||
| 581 | res = (((u64)(*deltatsc)) * pm_100ms); | 581 | res = (((u64)(*deltatsc)) * pm_100ms); |
| 582 | do_div(res, deltapm); | 582 | do_div(res, deltapm); |
| 583 | apic_printk(APIC_VERBOSE, "TSC delta adjusted to " | 583 | apic_printk(APIC_VERBOSE, "TSC delta adjusted to " |
| 584 | "PM-Timer: %lu (%ld) \n", | 584 | "PM-Timer: %lu (%ld)\n", |
| 585 | (unsigned long)res, *deltatsc); | 585 | (unsigned long)res, *deltatsc); |
| 586 | *deltatsc = (long)res; | 586 | *deltatsc = (long)res; |
| 587 | } | 587 | } |