lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mm: fix memory_hotplug.c printk format warning

Browse Source 
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>
This commit is contained in:
Randy Dunlap
2013-04-29 15:08:49 -07:00
committed by Linus Torvalds
parent 0cdc444a67
commit 349daa0f93
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mm/memory_hotplug.c
View File

@@ -1690,11 +1690,15 @@ static int is_memblock_offlined_cb(struct memory_block *mem, void *arg)
{ {
int ret = !is_memblock_offlined(mem); 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 " pr_warn("removing memory fails, because memory "
"[%#010llx-%#010llx] is onlined\n", "[%pa-%pa] is onlined\n",
PFN_PHYS(section_nr_to_pfn(mem->start_section_nr)), &beginpa, &endpa);
PFN_PHYS(section_nr_to_pfn(mem->end_section_nr + 1))-1); }
return ret; return ret;
} }