From 6b13c71072d9957f248f9aa8ddbfebf924f46ec1 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 12 Apr 2013 09:15:42 +0200 Subject: [PATCH] x86: fixup cpuid for some odd (android) 32-bit variants Signed-off-by: Jens Axboe --- arch/arch-x86-common.h | 9 --------- arch/arch-x86.h | 9 +++++++++ arch/arch-x86_64.h | 9 +++++++++ 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/arch/arch-x86-common.h b/arch/arch-x86-common.h index 78fd40c0..179572d4 100644 --- a/arch/arch-x86-common.h +++ b/arch/arch-x86-common.h @@ -3,15 +3,6 @@ #include -static inline void do_cpuid(unsigned int *eax, unsigned int *ebx, - unsigned int *ecx, unsigned int *edx) -{ - asm volatile("cpuid" - : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx) - : "0" (*eax), "2" (*ecx) - : "memory"); -} - static inline void cpuid(unsigned int op, unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx) diff --git a/arch/arch-x86.h b/arch/arch-x86.h index 69cf60b3..49e64dd3 100644 --- a/arch/arch-x86.h +++ b/arch/arch-x86.h @@ -1,6 +1,15 @@ #ifndef ARCH_X86_H #define ARCH_X86_H +static inline void do_cpuid(unsigned int *eax, unsigned int *ebx, + unsigned int *ecx, unsigned int *edx) +{ + asm volatile("xchgl %%ebx, %1\ncpuid\nxchgl %%ebx, %1" + : "=a" (*eax), "=r" (*ebx), "=c" (*ecx), "=d" (*edx) + : "0" (*eax) + : "memory"); +} + #include "arch-x86-common.h" #define FIO_ARCH (arch_i386) diff --git a/arch/arch-x86_64.h b/arch/arch-x86_64.h index cea0451d..8bdf01e8 100644 --- a/arch/arch-x86_64.h +++ b/arch/arch-x86_64.h @@ -1,6 +1,15 @@ #ifndef ARCH_X86_64_h #define ARCH_X86_64_h +static inline void do_cpuid(unsigned int *eax, unsigned int *ebx, + unsigned int *ecx, unsigned int *edx) +{ + asm volatile("cpuid" + : "=a" (*eax), "=b" (*ebx), "=r" (*ecx), "=d" (*edx) + : "0" (*eax), "2" (*ecx) + : "memory"); +} + #include "arch-x86-common.h" #define FIO_ARCH (arch_x86_64) -- 2.25.1