Resneptacle/openwrt-cghmn-mt300n
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel: fix warning when building fitblk on 32-bit platforms

Browse Source 
Kernel warns about comparision of different types without cast when
building the fitblk driver on 32-bit platforms.
Fix this by using `min_t(size_t, ...`.

Fixes: 8fc5457869 ("kernel: add pending fitblk uImage.FIT sub-image block driver")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2024-02-24 03:32:13 +00:00
parent 6368ed1ae5
commit 360d27eb76
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target/linux/generic/pending-6.1/510-block-add-uImage.FIT-subimage-block-driver.patch
View File

@ -81,7 +81,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
swim_mod-y := swim.o swim_asm.o swim_mod-y := swim.o swim_asm.o
--- /dev/null --- /dev/null
+++ b/drivers/block/fitblk.c +++ b/drivers/block/fitblk.c
@@ -0,0 +1,635 @@ @@ -0,0 +1,636 @@
+// SPDX-License-Identifier: GPL-2.0-only +// SPDX-License-Identifier: GPL-2.0-only
+/* +/*
+ * uImage.FIT virtual block device driver. + * uImage.FIT virtual block device driver.
@ -454,7 +454,8 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+ bytes_left = size; + bytes_left = size;
+ fit_c = fit; + fit_c = fit;
+ while (bytes_left > 0) { + while (bytes_left > 0) {
+ bytes_to_copy = min(bytes_left, folio_size(folio) - offset_in_folio(folio, 0)); + bytes_to_copy = min_t(size_t, bytes_left,
+ folio_size(folio) - offset_in_folio(folio, 0));
+ memcpy(fit_c, pre_fit, bytes_to_copy); + memcpy(fit_c, pre_fit, bytes_to_copy);
+ fit_c += bytes_to_copy; + fit_c += bytes_to_copy;
+ bytes_left -= bytes_to_copy; + bytes_left -= bytes_to_copy;