[<prev] [next>] [day] [month] [year] [list]
Message-ID: <tip-c3709e6734daa4d9b37fe31592ebb0eb57bae1bb@git.kernel.org>
Date: Mon, 14 May 2012 13:31:52 -0700
From: tip-bot for Alan Cox <alan@...ux.intel.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, alan@...ux.intel.com, hpa@...or.com,
mingo@...nel.org, mtosatti@...hat.com, tglx@...utronix.de,
hpa@...ux.intel.com, avi@...hat.com
Subject: [tip:x86/urgent] x86, kvm: KVM paravirt kernels don'
t check for CPUID being unavailable
Commit-ID: c3709e6734daa4d9b37fe31592ebb0eb57bae1bb
Gitweb: http://git.kernel.org/tip/c3709e6734daa4d9b37fe31592ebb0eb57bae1bb
Author: Alan Cox <alan@...ux.intel.com>
AuthorDate: Mon, 14 May 2012 18:41:09 +0100
Committer: H. Peter Anvin <hpa@...ux.intel.com>
CommitDate: Mon, 14 May 2012 10:49:32 -0700
x86, kvm: KVM paravirt kernels don't check for CPUID being unavailable
We set cpuid_level to -1 if there is no CPUID instruction (only
possible on i386).
Signed-off-by: Alan Cox <alan@...ux.intel.com>
Link: http://lkml.kernel.org/r/20120514174059.30236.1064.stgit@bluebook
Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=12122
Cc: Avi Kivity <avi@...hat.com>
Cc: Marcelo Tosatti <mtosatti@...hat.com>
Signed-off-by: H. Peter Anvin <hpa@...ux.intel.com>
---
arch/x86/include/asm/kvm_para.h | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/arch/x86/include/asm/kvm_para.h b/arch/x86/include/asm/kvm_para.h
index 734c376..183922e 100644
--- a/arch/x86/include/asm/kvm_para.h
+++ b/arch/x86/include/asm/kvm_para.h
@@ -170,6 +170,9 @@ static inline int kvm_para_available(void)
unsigned int eax, ebx, ecx, edx;
char signature[13];
+ if (boot_cpu_data.cpuid_level < 0)
+ return 0; /* So we don't blow up on old processors */
+
cpuid(KVM_CPUID_SIGNATURE, &eax, &ebx, &ecx, &edx);
memcpy(signature + 0, &ebx, 4);
memcpy(signature + 4, &ecx, 4);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists