Commit 349daa0f authored Apr 29, 2013 by Randy Dunlap Committed by Linus Torvalds Apr 29, 2013

mm: fix memory_hotplug.c printk format warning

PFN_PHYS() is a phys_addr_t, which can be u32 or u64.
Fix the build warning when phys_addr_t is u32.

mm/memory_hotplug.c: warning: format '%llx' expects argument of type 'long long unsigned int', but argument 2 has type 'unsigned int' [-Wformat]: => 1685:3
mm/memory_hotplug.c: warning: format '%llx' expects argument of type 'long long unsigned int', but argument 3 has type 'unsigned int' [-Wformat]: => 1685:3

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 0cdc444a

mm/memory_hotplug.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -1690,11 +1690,15 @@ static int is_memblock_offlined_cb(struct memory_block mem, void arg)
		{
		int ret = !is_memblock_offlined(mem);

		if (unlikely(ret))
		if (unlikely(ret)) {
		phys_addr_t beginpa, endpa;

		beginpa = PFN_PHYS(section_nr_to_pfn(mem->start_section_nr));
		endpa = PFN_PHYS(section_nr_to_pfn(mem->end_section_nr + 1))-1;
		pr_warn("removing memory fails, because memory "
		"[%#010llx-%#010llx] is onlined\n",
		PFN_PHYS(section_nr_to_pfn(mem->start_section_nr)),
		PFN_PHYS(section_nr_to_pfn(mem->end_section_nr + 1))-1);
		"[%pa-%pa] is onlined\n",
		&beginpa, &endpa);
		}

		return ret;
		}

Admin message