diff options
author | Chris Zankel <chris@zankel.net> | 2014-11-10 00:05:43 -0800 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2014-11-10 00:05:43 -0800 |
commit | aeb589734251aaf4c28d80d0efb5da01dc0ce868 (patch) | |
tree | ea1ee0a54d4c24221a1e80cd07e899f8b34a6920 /arch/x86/kernel/apic/apic.c | |
parent | 66acb0216d5ae1f29fe76c5a192547664c5c0159 (diff) | |
parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff) | |
download | linux-aeb589734251aaf4c28d80d0efb5da01dc0ce868.tar.gz linux-aeb589734251aaf4c28d80d0efb5da01dc0ce868.tar.bz2 linux-aeb589734251aaf4c28d80d0efb5da01dc0ce868.zip |
Merge tag 'v3.18-rc4' into for_next
Linux 3.18-rc4
Diffstat (limited to 'arch/x86/kernel/apic/apic.c')
-rw-r--r-- | arch/x86/kernel/apic/apic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 00853b254ab0..ba6cc041edb1 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1297,7 +1297,7 @@ void setup_local_APIC(void) unsigned int value, queued; int i, j, acked = 0; unsigned long long tsc = 0, ntsc; - long long max_loops = cpu_khz; + long long max_loops = cpu_khz ? cpu_khz : 1000000; if (cpu_has_tsc) rdtscll(tsc); @@ -1383,7 +1383,7 @@ void setup_local_APIC(void) break; } if (queued) { - if (cpu_has_tsc) { + if (cpu_has_tsc && cpu_khz) { rdtscll(ntsc); max_loops = (cpu_khz << 10) - (ntsc - tsc); } else |