diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-14 22:24:33 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-14 22:24:33 (GMT) |
| commit | 0861fd1c25a8ce79ae7647e384cb6555c46e1690 (patch) | |
| tree | 37cb316d5c8efd0cbb764c9080f10ff902b3c11c /arch/arm64/lib/clear_user.S | |
| parent | 5ae93760cbedda64eab0a7012cc3785c32399641 (diff) | |
| parent | 5fd6690c8fb2c3012012979dd8ce7492c69c5d86 (diff) | |
| download | linux-0861fd1c25a8ce79ae7647e384cb6555c46e1690.tar.xz | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Catalin Marinas:
- fix EFI stub cache maintenance causing aborts during boot on certain
platforms
- handle byte stores in __clear_user without panicking
- fix race condition in aarch64_insn_patch_text_sync() (instruction
patching)
- Couple of type fixes
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: ARCH_PFN_OFFSET should be unsigned long
Correct the race condition in aarch64_insn_patch_text_sync()
arm64: __clear_user: handle exceptions on strb
arm64: Fix data type for physical address
arm64: efi: Fix stub cache maintenance
Diffstat (limited to 'arch/arm64/lib/clear_user.S')
| -rw-r--r-- | arch/arm64/lib/clear_user.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/lib/clear_user.S b/arch/arm64/lib/clear_user.S index 6e0ed93..c17967f 100644 --- a/arch/arm64/lib/clear_user.S +++ b/arch/arm64/lib/clear_user.S @@ -46,7 +46,7 @@ USER(9f, strh wzr, [x0], #2 ) sub x1, x1, #2 4: adds x1, x1, #1 b.mi 5f - strb wzr, [x0] +USER(9f, strb wzr, [x0] ) 5: mov x0, #0 ret ENDPROC(__clear_user) |