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>

8 files changed, 18 insertions, 18 deletions

diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c
index 25efa534c4e4..222a57076039 100644
--- a/arch/x86/kernel/apb_timer.c
+++ b/arch/x86/kernel/apb_timer.c
@@ -263,7 +263,7 @@ static int apbt_clocksource_register(void)
 
         /* Verify whether apbt counter works */
         t1 = dw_apb_clocksource_read(clocksource_apbt);
-        start = native_read_tsc();
+        start = rdtsc();
 
         /*
          * We don't know the TSC frequency yet, but waiting for
@@ -273,7 +273,7 @@ static int apbt_clocksource_register(void)
          */
         do {
                 rep_nop();
-                now = native_read_tsc();
+                now = rdtsc();
         } while ((now - start) < 200000UL);
 
         /* APBT is the only always on clocksource, it has to work! */
@@ -390,13 +390,13 @@ unsigned long apbt_quick_calibrate(void)
         old = dw_apb_clocksource_read(clocksource_apbt);
         old += loop;
 
-        t1 = native_read_tsc();
+        t1 = rdtsc();
 
         do {
                 new = dw_apb_clocksource_read(clocksource_apbt);
         } while (new < old);
 
-        t2 = native_read_tsc();
+        t2 = rdtsc();
 
         shift = 5;
         if (unlikely(loop >> shift == 0)) {
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,
 {
         u64 tsc;
 
-        tsc = native_read_tsc();
+        tsc = rdtsc();
         wrmsrl(MSR_IA32_TSC_DEADLINE, tsc + (((u64) delta) * TSC_DIVISOR));
         return 0;
 }
@@ -592,7 +592,7 @@ static void __init lapic_cal_handler(struct clock_event_device *dev)
         unsigned long pm = acpi_pm_read_early();
 
         if (cpu_has_tsc)
-                tsc = native_read_tsc();
+                tsc = rdtsc();
 
         switch (lapic_cal_loops++) {
         case 0:
@@ -1209,7 +1209,7 @@ void setup_local_APIC(void)
         long long max_loops = cpu_khz ? cpu_khz : 1000000;
 
         if (cpu_has_tsc)
-                tsc = native_read_tsc();
+                tsc = rdtsc();
 
         if (disable_apic) {
                 disable_ioapic_support();
@@ -1293,7 +1293,7 @@ void setup_local_APIC(void)
                 }
                 if (queued) {
                         if (cpu_has_tsc && cpu_khz) {
-                                ntsc = native_read_tsc();
+                                ntsc = rdtsc();
                                 max_loops = (cpu_khz << 10) - (ntsc - tsc);
                         } else
                                 max_loops--;
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index a69710db6112..51ad2af84a72 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -125,10 +125,10 @@ static void init_amd_k6(struct cpuinfo_x86 *c)
 
                 n = K6_BUG_LOOP;
                 f_vide = vide;
-                d = native_read_tsc();
+                d = rdtsc();
                 while (n--)
                         f_vide();
-                d2 = native_read_tsc();
+                d2 = rdtsc();
                 d = d2-d;
 
                 if (d > 20*K6_BUG_LOOP)
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index a5283d2d0094..96cceccd11b4 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -125,7 +125,7 @@ void mce_setup(struct mce *m)
 {
         memset(m, 0, sizeof(struct mce));
         m->cpu = m->extcpu = smp_processor_id();
-        m->tsc = native_read_tsc();
+        m->tsc = rdtsc();
         /* We hope get_seconds stays lockless */
         m->time = get_seconds();
         m->cpuvendor = boot_cpu_data.x86_vendor;
@@ -1784,7 +1784,7 @@ static void collect_tscs(void *data)
 {
         unsigned long *cpu_tsc = (unsigned long *)data;
 
-        cpu_tsc[smp_processor_id()] = native_read_tsc();
+        cpu_tsc[smp_processor_id()] = rdtsc();
 }
 
 static int mce_apei_read_done;
diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c
index 334a2a9c034d..67315cd0132c 100644
--- a/arch/x86/kernel/espfix_64.c
+++ b/arch/x86/kernel/espfix_64.c
@@ -110,7 +110,7 @@ static void init_espfix_random(void)
          */
         if (!arch_get_random_long(&rand)) {
                 /* The constant is an arbitrary large prime */
-                rand = native_read_tsc();
+                rand = rdtsc();
                 rand *= 0xc345c6b72fd16123UL;
         }
 
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index cc390fe69b71..f75c5908c7a6 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -735,7 +735,7 @@ static int hpet_clocksource_register(void)
 
         /* Verify whether hpet counter works */
         t1 = hpet_readl(HPET_COUNTER);
-        start = native_read_tsc();
+        start = rdtsc();
 
         /*
          * We don't know the TSC frequency yet, but waiting for
@@ -745,7 +745,7 @@ static int hpet_clocksource_register(void)
          */
         do {
                 rep_nop();
-                now = native_read_tsc();
+                now = rdtsc();
         } while ((now - start) < 200000UL);
 
         if (t1 == hpet_readl(HPET_COUNTER)) {
diff --git a/arch/x86/kernel/trace_clock.c b/arch/x86/kernel/trace_clock.c
index bd8f4d41bd56..67efb8c96fc4 100644
--- a/arch/x86/kernel/trace_clock.c
+++ b/arch/x86/kernel/trace_clock.c
@@ -15,7 +15,7 @@ u64 notrace trace_clock_x86_tsc(void)
         u64 ret;
 
         rdtsc_barrier();
-        ret = native_read_tsc();
+        ret = rdtsc();
 
         return ret;
 }
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index e66f5dcaeb63..21d6e04e3e82 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -248,7 +248,7 @@ static void set_cyc2ns_scale(unsigned long cpu_khz, int cpu)
 
         data = cyc2ns_write_begin(cpu);
 
-        tsc_now = native_read_tsc();
+        tsc_now = rdtsc();
         ns_now = cycles_2_ns(tsc_now);
 
         /*
@@ -290,7 +290,7 @@ u64 native_sched_clock(void)
         }
 
         /* read the Time Stamp Counter: */
-        tsc_now = native_read_tsc();
+        tsc_now = rdtsc();
 
         /* return the value in ns */
         return cycles_2_ns(tsc_now);