diff options
| author |   Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-05-23 09:32:49 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-05-23 09:32:49 -0300 |
| commit | 0869331fbaa2c11c9e94e45305d17ce447189a0a (patch) | |
| tree | ceb7a26a3f39146dcf9bec3667ff19169bd5026b /arch/arm/kernel/entry-armv.S | |
| parent | perf parse-events: Move slots event for the hybrid platform too (diff) | |
| parent | Linux 5.18 (diff) | |
| download | linux-dev-0869331fbaa2c11c9e94e45305d17ce447189a0a.tar.xz linux-dev-0869331fbaa2c11c9e94e45305d17ce447189a0a.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To get the rest of 5.18.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 06508698abb8..7a8682468a84 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -1145,7 +1145,7 @@ vector_bhb_loop8_\name: @ bhb workaround mov r0, #8 -3: b . + 4 +3: W(b) . + 4 subs r0, r0, #1 bne 3b dsb |