diff options
author | Andy Lutomirski <luto@kernel.org> | 2015-06-25 12:44:07 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-07-06 09:23:28 -0400 |
commit | 4ea1636b04dbd66536fa387bae2eea463efc705b (patch) | |
tree | 02067d97d1f200b280df8df114b77f26ff1b8e89 /arch/x86/lib/delay.c | |
parent | fe47ae6e1a5005b2e82f7eab57b5c3820453293a (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/lib/delay.c')
-rw-r--r-- | arch/x86/lib/delay.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/lib/delay.c b/arch/x86/lib/delay.c index 35115f3786a9..f24bc59ab0a0 100644 --- a/arch/x86/lib/delay.c +++ b/arch/x86/lib/delay.c | |||
@@ -55,10 +55,10 @@ static void delay_tsc(unsigned long __loops) | |||
55 | preempt_disable(); | 55 | preempt_disable(); |
56 | cpu = smp_processor_id(); | 56 | cpu = smp_processor_id(); |
57 | rdtsc_barrier(); | 57 | rdtsc_barrier(); |
58 | bclock = native_read_tsc(); | 58 | bclock = rdtsc(); |
59 | for (;;) { | 59 | for (;;) { |
60 | rdtsc_barrier(); | 60 | rdtsc_barrier(); |
61 | now = native_read_tsc(); | 61 | now = rdtsc(); |
62 | if ((now - bclock) >= loops) | 62 | if ((now - bclock) >= loops) |
63 | break; | 63 | break; |
64 | 64 | ||
@@ -80,7 +80,7 @@ static void delay_tsc(unsigned long __loops) | |||
80 | loops -= (now - bclock); | 80 | loops -= (now - bclock); |
81 | cpu = smp_processor_id(); | 81 | cpu = smp_processor_id(); |
82 | rdtsc_barrier(); | 82 | rdtsc_barrier(); |
83 | bclock = native_read_tsc(); | 83 | bclock = rdtsc(); |
84 | } | 84 | } |
85 | } | 85 | } |
86 | preempt_enable(); | 86 | preempt_enable(); |
@@ -100,7 +100,7 @@ void use_tsc_delay(void) | |||
100 | int read_current_timer(unsigned long *timer_val) | 100 | int read_current_timer(unsigned long *timer_val) |
101 | { | 101 | { |
102 | if (delay_fn == delay_tsc) { | 102 | if (delay_fn == delay_tsc) { |
103 | *timer_val = native_read_tsc(); | 103 | *timer_val = rdtsc(); |
104 | return 0; | 104 | return 0; |
105 | } | 105 | } |
106 | return -1; | 106 | return -1; |