diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-16 14:22:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-16 14:22:45 -0400 |
| commit | 7d38cc02909b85f6f4d3f082c471f0151fc5be3e (patch) | |
| tree | cb352bf442ed28f223e7061d9265a79c02fca6db /arch/ia64/kvm | |
| parent | 10ec34fcb100412ab186c141a9c3557d1270effd (diff) | |
| parent | c0b5a64d937f8fff79b10410a8a70ecaa9a1c580 (diff) | |
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.S | 2 |
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 @@ | |||
| 64 | #include "kvm_minstate.h" | 64 | #include "kvm_minstate.h" |
| 65 | #include "vti.h" | 65 | #include "vti.h" |
| 66 | 66 | ||
| 67 | #if 1 | 67 | #if 0 |
| 68 | # define PSR_DEFAULT_BITS psr.ac | 68 | # define PSR_DEFAULT_BITS psr.ac |
| 69 | #else | 69 | #else |
| 70 | # define PSR_DEFAULT_BITS 0 | 70 | # define PSR_DEFAULT_BITS 0 |