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>

diff --git a/arch/x86/boot/compressed/aslr.c b/arch/x86/boot/compressed/aslr.c
index ea33236..6a9b96b 100644 (file)
--- a/arch/x86/boot/compressed/aslr.c
+++ b/arch/x86/boot/compressed/aslr.c
@@ -82,7 +82,7 @@ static unsigned long get_random_long(void)
 
        if (has_cpuflag(X86_FEATURE_TSC)) {
                debug_putstr(" RDTSC");
-               raw = native_read_tsc();
+               raw = rdtsc();
 
                random ^= raw;
                use_i8254 = false;

diff --cc arch/x86/entry/vdso/vclock_gettime.c
Simple merge

diff --cc arch/x86/include/asm/msr.h
Simple merge

diff --cc arch/x86/include/asm/pvclock.h
Simple merge

diff --cc arch/x86/include/asm/stackprotector.h
Simple merge

diff --cc arch/x86/include/asm/tsc.h
Simple merge

diff --cc arch/x86/kernel/apb_timer.c
Simple merge

diff --cc arch/x86/kernel/apic/apic.c
Simple merge

diff --cc arch/x86/kernel/cpu/amd.c
Simple merge

diff --cc arch/x86/kernel/cpu/mcheck/mce.c
Simple merge

diff --cc arch/x86/kernel/espfix_64.c
Simple merge

diff --cc arch/x86/kernel/hpet.c
Simple merge

diff --cc arch/x86/kernel/trace_clock.c
Simple merge

diff --cc arch/x86/kernel/tsc.c
Simple merge

diff --cc arch/x86/kvm/lapic.c
Simple merge

diff --cc arch/x86/kvm/svm.c
Simple merge

diff --cc arch/x86/kvm/vmx.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc arch/x86/lib/delay.c
Simple merge

diff --cc drivers/cpufreq/intel_pstate.c
Simple merge

diff --cc drivers/input/gameport/gameport.c
Simple merge

diff --cc drivers/input/joystick/analog.c
Simple merge

diff --cc drivers/net/hamradio/baycom_epp.c
Simple merge

diff --cc drivers/thermal/intel_powerclamp.c
Simple merge

diff --cc tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c
Simple merge