diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-05-17 10:55:12 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-05-17 10:55:12 +0300 |
| commit | a4345a7cecfb91ae78cd43d26b0c6a956420761a (patch) | |
| tree | b0cf6296f791fa250ccc9d419c46f48fb73c331b /arch/hexagon/include/asm/futex.h | |
| parent | ce7ea0cfdc2e9ff31d12da31c3226deddb9644f5 (diff) | |
| parent | cb853ded1d25e5b026ce115dbcde69e3d7e2e831 (diff) | |
| download | linux-a4345a7cecfb91ae78cd43d26b0c6a956420761a.tar.xz | |
Merge tag 'kvmarm-fixes-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 fixes for 5.13, take #1
- Fix regression with irqbypass not restarting the guest on failed connect
- Fix regression with debug register decoding resulting in overlapping access
- Commit exception state on exit to usrspace
- Fix the MMU notifier return values
- Add missing 'static' qualifiers in the new host stage-2 code
Diffstat (limited to 'arch/hexagon/include/asm/futex.h')
| -rw-r--r-- | arch/hexagon/include/asm/futex.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/hexagon/include/asm/futex.h b/arch/hexagon/include/asm/futex.h index 6b9c554aee78..9fb00a0ae89f 100644 --- a/arch/hexagon/include/asm/futex.h +++ b/arch/hexagon/include/asm/futex.h @@ -21,7 +21,7 @@ "3:\n" \ ".section .fixup,\"ax\"\n" \ "4: %1 = #%5;\n" \ - " jump 3b\n" \ + " jump ##3b\n" \ ".previous\n" \ ".section __ex_table,\"a\"\n" \ ".long 1b,4b,2b,4b\n" \ @@ -90,7 +90,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, u32 oldval, "3:\n" ".section .fixup,\"ax\"\n" "4: %0 = #%6\n" - " jump 3b\n" + " jump ##3b\n" ".previous\n" ".section __ex_table,\"a\"\n" ".long 1b,4b,2b,4b\n" |