Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 251019fb authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

ARM: 7650/1: mm: replace direct access to mm->context.id with new macro 



The mmid macro is meant to be used to get the mm->context.id data
from the mm structure, but it seems to have been missed in a cuple
of files.

Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarBen Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9520a5be

arch/arm/mm/proc-v6.S

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ ENTRY(cpu_v6_dcache_clean_area) 
ENTRY(cpu_v6_switch_mm)

#ifdef CONFIG_MMU

	mov	r2, #0

	ldr	r1, [r1, #MM_CONTEXT_ID]	@ get mm->context.id

	mmid	r1, r1				@ get mm->context.id

	ALT_SMP(orr	r0, r0, #TTB_FLAGS_SMP)

	ALT_UP(orr	r0, r0, #TTB_FLAGS_UP)

	mcr	p15, 0, r2, c7, c5, 6		@ flush BTAC/BTB

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

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
ENTRY(cpu_v7_switch_mm)

#ifdef CONFIG_MMU

	mov	r2, #0

	ldr	r1, [r1, #MM_CONTEXT_ID]	@ get mm->context.id

	mmid	r1, r1				@ get mm->context.id

	ALT_SMP(orr	r0, r0, #TTB_FLAGS_SMP)

	ALT_UP(orr	r0, r0, #TTB_FLAGS_UP)

#ifdef CONFIG_ARM_ERRATA_430973

arch/arm/mm/proc-v7-3level.S

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
 */

ENTRY(cpu_v7_switch_mm)

#ifdef CONFIG_MMU

	ldr	r1, [r1, #MM_CONTEXT_ID]	@ get mm->context.id

	mmid	r1, r1				@ get mm->context.id

	and	r3, r1, #0xff

	mov	r3, r3, lsl #(48 - 32)		@ ASID

	mcrr	p15, 0, r0, r3, c2		@ set TTB 0