diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-22 14:52:17 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-22 14:52:28 +0100 |
| commit | 2c6a140e97ce3bb3cc5c5d637bf1e7dba95b0936 (patch) | |
| tree | 50c8f3b36f6aa35e0383df45c2edea477a3f375e /arch/arm/lib | |
| parent | 618b00d8d20a4793984f802454c74af8593e898a (diff) | |
| parent | 2a910f4af54d11deaefdc445f895724371645a97 (diff) | |
Merge tag 'v5.15.139' into fslc-5.15-2.2.x-imx
This is the 5.15.139 stable release
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Conflicts:
drivers/clk/imx/clk-imx8mq.c
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/memset.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S index 9817cb258c1a..0481b9bbbd00 100644 --- a/arch/arm/lib/memset.S +++ b/arch/arm/lib/memset.S @@ -17,6 +17,7 @@ ENTRY(__memset) ENTRY(mmioset) WEAK(memset) UNWIND( .fnstart ) + and r1, r1, #255 @ cast to unsigned char ands r3, r0, #3 @ 1 unaligned? mov ip, r0 @ preserve r0 as return value bne 6f @ 1 |