summaryrefslogtreecommitdiffstats
path: root/arch/ia64/kvm
diff options
context:
space:
mode:
authorLinus Torvalds2014-04-16 20:22:45 +0200
committerLinus Torvalds2014-04-16 20:22:45 +0200
commit7d38cc02909b85f6f4d3f082c471f0151fc5be3e (patch)
treecb352bf442ed28f223e7061d9265a79c02fca6db /arch/ia64/kvm
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
parent[IA64] Change default PSR.ac from '1' to '0' (Fix erratum #237) (diff)
downloadkernel-qcow2-linux-7d38cc02909b85f6f4d3f082c471f0151fc5be3e.tar.gz
kernel-qcow2-linux-7d38cc02909b85f6f4d3f082c471f0151fc5be3e.tar.xz
kernel-qcow2-linux-7d38cc02909b85f6f4d3f082c471f0151fc5be3e.zip
Merge tag 'please-pull-ia64-erratum' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull itanium erratum fix from Tony Luck: "Small workaround for a rare, but annoying, erratum #237" * tag 'please-pull-ia64-erratum' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: [IA64] Change default PSR.ac from '1' to '0' (Fix erratum #237)
Diffstat (limited to 'arch/ia64/kvm')
-rw-r--r--arch/ia64/kvm/vmm_ivt.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kvm/vmm_ivt.S b/arch/ia64/kvm/vmm_ivt.S
index 24018484c6e9..397e34a63e18 100644
--- a/arch/ia64/kvm/vmm_ivt.S
+++ b/arch/ia64/kvm/vmm_ivt.S
@@ -64,7 +64,7 @@
#include "kvm_minstate.h"
#include "vti.h"
-#if 1
+#if 0
# define PSR_DEFAULT_BITS psr.ac
#else
# define PSR_DEFAULT_BITS 0