projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[linux-2.6-microblaze.git]
/
arch
/
x86
/
kvm
/
cpuid.c
diff --git
a/arch/x86/kvm/cpuid.c
b/arch/x86/kvm/cpuid.c
index
9a48f13
..
b4da665
100644
(file)
--- a/
arch/x86/kvm/cpuid.c
+++ b/
arch/x86/kvm/cpuid.c
@@
-655,6
+655,7
@@
static int __do_cpuid_func_emulated(struct kvm_cpuid_array *array, u32 func)
if (kvm_cpu_cap_has(X86_FEATURE_RDTSCP))
entry->ecx = F(RDPID);
++array->nent;
+ break;
default:
break;
}