diff options
| author | Alan Cox | 2009-07-04 01:35:45 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2009-07-11 11:24:09 +0200 |
| commit | 8bdbd962ecfcbdd96f9dbb02d780b4553afd2543 (patch) | |
| tree | 74c7c511e39febf981cdc90bd933c0d81130ccfa /arch/x86/kernel/cpu/vmware.c | |
| parent | x86: Remove duplicated #include (diff) | |
| download | kernel-qcow2-linux-8bdbd962ecfcbdd96f9dbb02d780b4553afd2543.tar.gz kernel-qcow2-linux-8bdbd962ecfcbdd96f9dbb02d780b4553afd2543.tar.xz kernel-qcow2-linux-8bdbd962ecfcbdd96f9dbb02d780b4553afd2543.zip | |
x86/cpu: Clean up various files a bit
No code changes except printk levels (although some of the K6
mtrr code might be clearer if there were a few as would
splitting out some of the intel cache code).
Signed-off-by: Alan Cox <alan@linux.intel.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu/vmware.c')
| -rw-r--r-- | arch/x86/kernel/cpu/vmware.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c index 284c399e3234..bc24f514ec93 100644 --- a/arch/x86/kernel/cpu/vmware.c +++ b/arch/x86/kernel/cpu/vmware.c @@ -49,17 +49,17 @@ static inline int __vmware_platform(void) static unsigned long __vmware_get_tsc_khz(void) { - uint64_t tsc_hz; - uint32_t eax, ebx, ecx, edx; + uint64_t tsc_hz; + uint32_t eax, ebx, ecx, edx; - VMWARE_PORT(GETHZ, eax, ebx, ecx, edx); + VMWARE_PORT(GETHZ, eax, ebx, ecx, edx); - if (ebx == UINT_MAX) - return 0; - tsc_hz = eax | (((uint64_t)ebx) << 32); - do_div(tsc_hz, 1000); - BUG_ON(tsc_hz >> 32); - return tsc_hz; + if (ebx == UINT_MAX) + return 0; + tsc_hz = eax | (((uint64_t)ebx) << 32); + do_div(tsc_hz, 1000); + BUG_ON(tsc_hz >> 32); + return tsc_hz; } /* |