浏览代码

[ARM] 5318/1: Swap the PRRR and NMRR values in proc-v7.S

A typo caused these values to be swapped leading to incorrect memory
type attributes.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Catalin Marinas 16 年之前
父节点
当前提交
f80a3bb252
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      arch/arm/mm/proc-v7.S

+ 2 - 2
arch/arm/mm/proc-v7.S

@@ -180,8 +180,8 @@ __v7_setup:
 	mov	r10, #0x1f			@ domains 0, 1 = manager
 	mov	r10, #0x1f			@ domains 0, 1 = manager
 	mcr	p15, 0, r10, c3, c0, 0		@ load domain access register
 	mcr	p15, 0, r10, c3, c0, 0		@ load domain access register
 #endif
 #endif
-	ldr	r5, =0x40e040e0
-	ldr	r6, =0xff0aa1a8
+	ldr	r5, =0xff0aa1a8
+	ldr	r6, =0x40e040e0
 	mcr	p15, 0, r5, c10, c2, 0		@ write PRRR
 	mcr	p15, 0, r5, c10, c2, 0		@ write PRRR
 	mcr	p15, 0, r6, c10, c2, 1		@ write NMRR
 	mcr	p15, 0, r6, c10, c2, 1		@ write NMRR
 	adr	r5, v7_crval
 	adr	r5, v7_crval