diff options
| author | Adeel Raza <araza@nvidia.com> | 2013-09-30 17:23:43 -0700 |
|---|---|---|
| committer | Bharat Nihalani <bnihalani@nvidia.com> | 2013-10-02 10:55:24 -0700 |
| commit | a31f3cb5bb973576db3654422b88e503d7cf4f67 (patch) | |
| tree | 92105b877233f9a39a4de4b7ce2ea4883bd54c10 /arch/arm/mm | |
| parent | 57a95f2bbaf47930c668cf526034820c96044529 (diff) | |
arm: mm: fix mm merge conflict
Bug 1379902
Change-Id: I7e9419dbe2ea2386cee27343f419a8c2d383c706
Signed-off-by: Adeel Raza <araza@nvidia.com>
Reviewed-on: http://git-master/r/280487
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Alexander Van Brunt <avanbrunt@nvidia.com>
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/proc-v7-3level.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-v7-3level.S b/arch/arm/mm/proc-v7-3level.S index 9090c95e738d..e377cc4031b0 100644 --- a/arch/arm/mm/proc-v7-3level.S +++ b/arch/arm/mm/proc-v7-3level.S @@ -55,7 +55,6 @@ */ ENTRY(cpu_v7_switch_mm) #ifdef CONFIG_MMU - ldr r2, [r2, #MM_CONTEXT_ID] @ get mm->context.id mmid r2, r2 @ get mm->context.id asid r2, r2 mov r2, r2, lsl #(48 - 32) @ ASID |