diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-04 09:04:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-04 09:04:26 -0700 |
| commit | 0d45dab6c14346171b99aea34011c34f91f921fd (patch) | |
| tree | ac483e483b4af4c0f92383098d0399fff72b2a36 /arch/arm64/mm/tlb.S | |
| parent | 0bfdbf0e79ab20394c932f27f6d3a34b757035ef (diff) | |
| parent | 09d3ce74d7d60f37d1b030886ec659bbfe2e73bf (diff) | |
| download | linux-0d45dab6c14346171b99aea34011c34f91f921fd.tar.bz2 | |
Merge tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64
Pull ARM64 fixes/updates from Catalin Marinas:
- Bug-fixes (get_user/put_user, incorrect register width for ASID,
FPSIMD initialisation)
- Kconfig clean-up
- defconfig update
* tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
arm64: Remove duplicate DEBUG_STACK_USAGE config
arm64: include VIRTIO_{MMIO,BLK} in defconfig
arm64: include EXT4 in defconfig
arm64: fix possible invalid FPSIMD initialization state
arm64: use correct register width when retrieving ASID
arm64: avoid multiple evaluation of ptr in get_user/put_user()
Diffstat (limited to 'arch/arm64/mm/tlb.S')
| -rw-r--r-- | arch/arm64/mm/tlb.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/tlb.S b/arch/arm64/mm/tlb.S index 8ae80a18e8ec..19da91e0cd27 100644 --- a/arch/arm64/mm/tlb.S +++ b/arch/arm64/mm/tlb.S @@ -35,7 +35,7 @@ */ ENTRY(__cpu_flush_user_tlb_range) vma_vm_mm x3, x2 // get vma->vm_mm - mmid x3, x3 // get vm_mm->context.id + mmid w3, x3 // get vm_mm->context.id dsb sy lsr x0, x0, #12 // align address lsr x1, x1, #12 |