projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
arch
/
powerpc
/
kvm
/
book3s_hv_ras.c
diff --git
a/arch/powerpc/kvm/book3s_hv_ras.c
b/arch/powerpc/kvm/book3s_hv_ras.c
index
d562c8e
..
60081bd
100644
(file)
--- a/
arch/powerpc/kvm/book3s_hv_ras.c
+++ b/
arch/powerpc/kvm/book3s_hv_ras.c
@@
-138,8
+138,5
@@
out:
long kvmppc_realmode_machine_check(struct kvm_vcpu *vcpu)
{
- if (cpu_has_feature(CPU_FTR_ARCH_206))
- return kvmppc_realmode_mc_power7(vcpu);
-
- return 0;
+ return kvmppc_realmode_mc_power7(vcpu);
}