diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2020-09-03 21:14:49 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2020-09-03 21:14:49 +0000 |
| commit | a9364a050b42c82de635a00e086b94214f305454 (patch) | |
| tree | b2a6b894380debb206c586c36bb57290c6597cb6 /arch/arm64/kvm | |
| parent | c874333fa0bea09c0cb6dc5466a48f8bb4499fac (diff) | |
| parent | 933cf1c2c075f44c7b6837b6201e0db2d488835a (diff) | |
Merge tag 'v5.4.62' into 5.4-2.1.x-imx
This is the 5.4.62 stable release
Conflicts (manual resolve):
- drivers/usb/dwc3/gadget.c
Fix a hickup during applying of the patch 4bc5d90a7dce1 from upstream,
that version is taken over the NXP one.
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'arch/arm64/kvm')
| -rw-r--r-- | arch/arm64/kvm/hyp/switch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c index d76a3d39b269..6f4838b475d0 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -754,7 +754,7 @@ static void __hyp_text __hyp_call_panic_nvhe(u64 spsr, u64 elr, u64 par, * making sure it is a kernel address and not a PC-relative * reference. */ - asm volatile("ldr %0, =__hyp_panic_string" : "=r" (str_va)); + asm volatile("ldr %0, =%1" : "=r" (str_va) : "S" (__hyp_panic_string)); __hyp_do_panic(str_va, spsr, elr, |