Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936021Ab3DRA7n (ORCPT ); Wed, 17 Apr 2013 20:59:43 -0400 Received: from casper.infradead.org ([85.118.1.10]:52799 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751820Ab3DRA7m (ORCPT ); Wed, 17 Apr 2013 20:59:42 -0400 Message-ID: <516F456E.9060003@infradead.org> Date: Wed, 17 Apr 2013 17:59:26 -0700 From: Randy Dunlap User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130329 Thunderbird/17.0.5 MIME-Version: 1.0 To: LKML , Linux MM , Andrew Morton , Linus Torvalds Subject: [PATCH] mm: fix memory_hotplug.c printk format warning Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2085 Lines: 56 From: Randy Dunlap 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 Reported-by: Geert Uytterhoeven --- mm/memory_hotplug.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) I guess this modern "%pa" is preferred over casting to (u64), but just casting seems a simpler fix to me. I.e.: if (unlikely(ret)) 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); + (u64)PFN_PHYS(section_nr_to_pfn(mem->start_section_nr)), + (u64)PFN_PHYS(section_nr_to_pfn( + mem->end_section_nr + 1))-1); return ret; } --- lnx-39-rc7.orig/mm/memory_hotplug.c +++ lnx-39-rc7/mm/memory_hotplug.c @@ -1681,11 +1681,15 @@ static int is_memblock_offlined_cb(struc { 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; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/