diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-12-10 07:28:43 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-12-10 07:28:43 -0800 |
| commit | a69ce65274ff1589bb64ea782a4178d7210da0bb (patch) | |
| tree | d039adba20838b165626987a5f63ff89c3e16338 /arch/x86/kernel/verify_cpu.S | |
| parent | caf91bc186175f0005ed77295f1acd52c6aeca47 (diff) | |
| parent | d235b7b42ab59e2e616082a0735b3bcc76685c7b (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-androidlsk-v3.10-16.01-androidlsk-v3.10-15.12-android
Diffstat (limited to 'arch/x86/kernel/verify_cpu.S')
| -rw-r--r-- | arch/x86/kernel/verify_cpu.S | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S index b9242bacbe59..4cf401f581e7 100644 --- a/arch/x86/kernel/verify_cpu.S +++ b/arch/x86/kernel/verify_cpu.S @@ -34,10 +34,11 @@ #include <asm/msr-index.h> verify_cpu: - pushfl # Save caller passed flags - pushl $0 # Kill any dangerous flags - popfl + pushf # Save caller passed flags + push $0 # Kill any dangerous flags + popf +#ifndef __x86_64__ pushfl # standard way to check for cpuid popl %eax movl %eax,%ebx @@ -48,6 +49,7 @@ verify_cpu: popl %eax cmpl %eax,%ebx jz verify_cpu_no_longmode # cpu has no cpuid +#endif movl $0x0,%eax # See if cpuid 1 is implemented cpuid @@ -130,10 +132,10 @@ verify_cpu_sse_test: jmp verify_cpu_sse_test # try again verify_cpu_no_longmode: - popfl # Restore caller passed flags + popf # Restore caller passed flags movl $1,%eax ret verify_cpu_sse_ok: - popfl # Restore caller passed flags + popf # Restore caller passed flags xorl %eax, %eax ret |