The patch titled
Subject: memblock: fix format strings for panics after memblock_alloc
has been removed from the -mm tree. Its filename was
treewide-add-checks-for-the-return-value-of-memblock_alloc-fix-2.patch
This patch was dropped because it was folded into treewide-add-checks-for-the-return-value-of-memblock_alloc.patch
------------------------------------------------------
From: Mike Rapoport <rppt@xxxxxxxxxxxxx>
Subject: memblock: fix format strings for panics after memblock_alloc
Using "%lu" to print size_t variables causes build warnings on i386 and
probably other architectures:
kernel/dma/swiotlb.c:210:35: warning: format '%lu' expects argument of type
'long unsigned int', but argument 3 has type 'size_t' {aka 'unsigned int'}
[-Wformat=]
panic("%s: Failed to allocate %lu bytes align=0x%lx
",
~~^
%u
__func__, alloc_size, PAGE_SIZE);
~~~~~~~~~~
Replace "%lu" with "%zu".
Link: http://lkml.kernel.org/r/1548950940-15145-1-git-send-email-rppt@xxxxxxxxxxxxx
Signed-off-by: Mike Rapoport <rppt@xxxxxxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/platform/olpc/olpc_dt.c | 2 +-
kernel/dma/swiotlb.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--- a/arch/x86/platform/olpc/olpc_dt.c~treewide-add-checks-for-the-return-value-of-memblock_alloc-fix-2
+++ a/arch/x86/platform/olpc/olpc_dt.c
@@ -142,7 +142,7 @@ void * __init prom_early_alloc(unsigned
*/
res = memblock_alloc(chunk_size, SMP_CACHE_BYTES);
if (!res)
- panic("%s: Failed to allocate %lu bytes\n", __func__,
+ panic("%s: Failed to allocate %zu bytes\n", __func__,
chunk_size);
BUG_ON(!res);
prom_early_allocated += chunk_size;
--- a/kernel/dma/swiotlb.c~treewide-add-checks-for-the-return-value-of-memblock_alloc-fix-2
+++ a/kernel/dma/swiotlb.c
@@ -215,13 +215,13 @@ int __init swiotlb_init_with_tbl(char *t
alloc_size = PAGE_ALIGN(io_tlb_nslabs * sizeof(int));
io_tlb_list = memblock_alloc(alloc_size, PAGE_SIZE);
if (!io_tlb_list)
- panic("%s: Failed to allocate %lu bytes align=0x%lx\n",
+ panic("%s: Failed to allocate %zu bytes align=0x%lx\n",
__func__, alloc_size, PAGE_SIZE);
alloc_size = PAGE_ALIGN(io_tlb_nslabs * sizeof(phys_addr_t));
io_tlb_orig_addr = memblock_alloc(alloc_size, PAGE_SIZE);
if (!io_tlb_orig_addr)
- panic("%s: Failed to allocate %lu bytes align=0x%lx\n",
+ panic("%s: Failed to allocate %zu bytes align=0x%lx\n",
__func__, alloc_size, PAGE_SIZE);
for (i = 0; i < io_tlb_nslabs; i++) {
_
Patches currently in -mm which might be from rppt@xxxxxxxxxxxxx are
openrisc-prefer-memblock-apis-returning-virtual-address.patch
memblock-replace-memblock_alloc_baseanywhere-with-memblock_phys_alloc.patch
memblock-drop-memblock_alloc_base_nid.patch
memblock-emphasize-that-memblock_alloc_range-returns-a-physical-address.patch
memblock-memblock_phys_alloc_try_nid-dont-panic.patch
memblock-memblock_phys_alloc-dont-panic.patch
memblock-drop-__memblock_alloc_base.patch
memblock-drop-memblock_alloc_base.patch
memblock-make-memblock_find_in_range_node-and-choose_memblock_flags-static.patch
arch-use-memblock_alloc-instead-of-memblock_alloc_fromsize-align-0.patch
arch-dont-memset0-memory-returned-by-memblock_alloc.patch
ia64-add-checks-for-the-return-value-of-memblock_alloc.patch
sparc-add-checks-for-the-return-value-of-memblock_alloc.patch
mm-percpu-add-checks-for-the-return-value-of-memblock_alloc.patch
init-main-add-checks-for-the-return-value-of-memblock_alloc.patch
swiotlb-add-checks-for-the-return-value-of-memblock_alloc.patch
treewide-add-checks-for-the-return-value-of-memblock_alloc.patch
treewide-add-checks-for-the-return-value-of-memblock_alloc-fix-3.patch
memblock-memblock_alloc_try_nid-dont-panic.patch
memblock-drop-memblock_alloc__nopanic-variants.patch
memblock-remove-memblock_setclear_region_flags.patch
memblock-split-checks-whether-a-region-should-be-skipped-to-a-helper-function.patch
memblock-update-comments-and-kernel-doc.patch
of-fix-kmemleak-crash-caused-by-imbalance-in-early-memory-reservation.patch
of-fix-kmemleak-crash-caused-by-imbalance-in-early-memory-reservation-fix.patch
