Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 7d38cc02909b85f6f4d3f082c471f0151fc5be3e

Authored by Linus Torvalds
2 parents 10ec34fcb1 c0b5a64d93
Exists in master and in 13 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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)

Showing 3 changed files Side-by-side Diff

arch/ia64/kernel/head.S
Diff comments   View file @ 7d38cc0
... ... @@ -259,7 +259,7 @@
259 259 * Switch into virtual mode:
260 260 */
261 261 movl r16=(IA64_PSR_IT|IA64_PSR_IC|IA64_PSR_DT|IA64_PSR_RT|IA64_PSR_DFH|IA64_PSR_BN \
262   - |IA64_PSR_DI|IA64_PSR_AC)
  262 + |IA64_PSR_DI)
263 263 ;;
264 264 mov cr.ipsr=r16
265 265 movl r17=1f
arch/ia64/kernel/ivt.S
Diff comments   View file @ 7d38cc0
... ... @@ -58,7 +58,7 @@
58 58 #include <asm/unistd.h>
59 59 #include <asm/errno.h>
60 60  
61   -#if 1
  61 +#if 0
62 62 # define PSR_DEFAULT_BITS psr.ac
63 63 #else
64 64 # define PSR_DEFAULT_BITS 0
arch/ia64/kvm/vmm_ivt.S
Diff comments   View file @ 7d38cc0
... ... @@ -64,7 +64,7 @@
64 64 #include "kvm_minstate.h"
65 65 #include "vti.h"
66 66  
67   -#if 1
  67 +#if 0
68 68 # define PSR_DEFAULT_BITS psr.ac
69 69 #else
70 70 # define PSR_DEFAULT_BITS 0