diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/vsyscall_64.c | 4 | ||||
-rw-r--r-- | arch/x86/vdso/vgetcpu.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c index 018f7cf33790..c4c5e765cd2c 100644 --- a/arch/x86/kernel/vsyscall_64.c +++ b/arch/x86/kernel/vsyscall_64.c | |||
@@ -190,7 +190,7 @@ time_t __vsyscall(1) vtime(time_t *t) | |||
190 | long __vsyscall(2) | 190 | long __vsyscall(2) |
191 | vgetcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *tcache) | 191 | vgetcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *tcache) |
192 | { | 192 | { |
193 | unsigned int dummy, p; | 193 | unsigned int p; |
194 | unsigned long j = 0; | 194 | unsigned long j = 0; |
195 | 195 | ||
196 | /* Fast cache - only recompute value once per jiffies and avoid | 196 | /* Fast cache - only recompute value once per jiffies and avoid |
@@ -205,7 +205,7 @@ vgetcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *tcache) | |||
205 | p = tcache->blob[1]; | 205 | p = tcache->blob[1]; |
206 | } else if (__vgetcpu_mode == VGETCPU_RDTSCP) { | 206 | } else if (__vgetcpu_mode == VGETCPU_RDTSCP) { |
207 | /* Load per CPU data from RDTSCP */ | 207 | /* Load per CPU data from RDTSCP */ |
208 | rdtscp(dummy, dummy, p); | 208 | native_read_tscp(&p); |
209 | } else { | 209 | } else { |
210 | /* Load per CPU data from GDT */ | 210 | /* Load per CPU data from GDT */ |
211 | asm("lsl %1,%0" : "=r" (p) : "r" (__PER_CPU_SEG)); | 211 | asm("lsl %1,%0" : "=r" (p) : "r" (__PER_CPU_SEG)); |
diff --git a/arch/x86/vdso/vgetcpu.c b/arch/x86/vdso/vgetcpu.c index 3b1ae1abfba9..c8097f17f8a9 100644 --- a/arch/x86/vdso/vgetcpu.c +++ b/arch/x86/vdso/vgetcpu.c | |||
@@ -15,11 +15,11 @@ | |||
15 | 15 | ||
16 | long __vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unused) | 16 | long __vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unused) |
17 | { | 17 | { |
18 | unsigned int dummy, p; | 18 | unsigned int p; |
19 | 19 | ||
20 | if (*vdso_vgetcpu_mode == VGETCPU_RDTSCP) { | 20 | if (*vdso_vgetcpu_mode == VGETCPU_RDTSCP) { |
21 | /* Load per CPU data from RDTSCP */ | 21 | /* Load per CPU data from RDTSCP */ |
22 | rdtscp(dummy, dummy, p); | 22 | native_read_tscp(&p); |
23 | } else { | 23 | } else { |
24 | /* Load per CPU data from GDT */ | 24 | /* Load per CPU data from GDT */ |
25 | asm("lsl %1,%0" : "=r" (p) : "r" (__PER_CPU_SEG)); | 25 | asm("lsl %1,%0" : "=r" (p) : "r" (__PER_CPU_SEG)); |