aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic/apic.c
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@kernel.org>2015-06-25 12:44:07 -0400
committerIngo Molnar <mingo@kernel.org>2015-07-06 09:23:28 -0400
commit4ea1636b04dbd66536fa387bae2eea463efc705b (patch)
tree02067d97d1f200b280df8df114b77f26ff1b8e89 /arch/x86/kernel/apic/apic.c
parentfe47ae6e1a5005b2e82f7eab57b5c3820453293a (diff)
x86/asm/tsc: Rename native_read_tsc() to rdtsc()
Now that there is no paravirt TSC, the "native" is inappropriate. The function does RDTSC, so give it the obvious name: rdtsc(). Suggested-by: Borislav Petkov <bp@suse.de> Signed-off-by: Andy Lutomirski <luto@kernel.org> Signed-off-by: Borislav Petkov <bp@suse.de> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Huang Rui <ray.huang@amd.com> Cc: John Stultz <john.stultz@linaro.org> Cc: Len Brown <lenb@kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: kvm ML <kvm@vger.kernel.org> Link: http://lkml.kernel.org/r/fd43e16281991f096c1e4d21574d9e1402c62d39.1434501121.git.luto@kernel.org [ Ported it to v4.2-rc1. ] Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/apic/apic.c')
-rw-r--r--arch/x86/kernel/apic/apic.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 51af1ed1ae2e..0d71cd9b4a50 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -457,7 +457,7 @@ static int lapic_next_deadline(unsigned long delta,
457{ 457{
458 u64 tsc; 458 u64 tsc;
459 459
460 tsc = native_read_tsc(); 460 tsc = rdtsc();
461 wrmsrl(MSR_IA32_TSC_DEADLINE, tsc + (((u64) delta) * TSC_DIVISOR)); 461 wrmsrl(MSR_IA32_TSC_DEADLINE, tsc + (((u64) delta) * TSC_DIVISOR));
462 return 0; 462 return 0;
463} 463}
@@ -592,7 +592,7 @@ static void __init lapic_cal_handler(struct clock_event_device *dev)
592 unsigned long pm = acpi_pm_read_early(); 592 unsigned long pm = acpi_pm_read_early();
593 593
594 if (cpu_has_tsc) 594 if (cpu_has_tsc)
595 tsc = native_read_tsc(); 595 tsc = rdtsc();
596 596
597 switch (lapic_cal_loops++) { 597 switch (lapic_cal_loops++) {
598 case 0: 598 case 0:
@@ -1209,7 +1209,7 @@ void setup_local_APIC(void)
1209 long long max_loops = cpu_khz ? cpu_khz : 1000000; 1209 long long max_loops = cpu_khz ? cpu_khz : 1000000;
1210 1210
1211 if (cpu_has_tsc) 1211 if (cpu_has_tsc)
1212 tsc = native_read_tsc(); 1212 tsc = rdtsc();
1213 1213
1214 if (disable_apic) { 1214 if (disable_apic) {
1215 disable_ioapic_support(); 1215 disable_ioapic_support();
@@ -1293,7 +1293,7 @@ void setup_local_APIC(void)
1293 } 1293 }
1294 if (queued) { 1294 if (queued) {
1295 if (cpu_has_tsc && cpu_khz) { 1295 if (cpu_has_tsc && cpu_khz) {
1296 ntsc = native_read_tsc(); 1296 ntsc = rdtsc();
1297 max_loops = (cpu_khz << 10) - (ntsc - tsc); 1297 max_loops = (cpu_khz << 10) - (ntsc - tsc);
1298 } else 1298 } else
1299 max_loops--; 1299 max_loops--;