From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C069DC4332E for ; Wed, 18 Mar 2020 21:33:26 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6ACF120777 for ; Wed, 18 Mar 2020 21:33:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="ix5Z/nym" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6ACF120777 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id E1C6F6B009A; Wed, 18 Mar 2020 17:33:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DCC756B009B; Wed, 18 Mar 2020 17:33:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CE2DE6B009C; Wed, 18 Mar 2020 17:33:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0130.hostedemail.com [216.40.44.130]) by kanga.kvack.org (Postfix) with ESMTP id B28876B009A for ; Wed, 18 Mar 2020 17:33:25 -0400 (EDT) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 663A54DB8 for ; Wed, 18 Mar 2020 21:33:25 +0000 (UTC) X-FDA: 76609784370.19.birth07_1dda9e7507a08 X-HE-Tag: birth07_1dda9e7507a08 X-Filterd-Recvd-Size: 5068 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf23.hostedemail.com (Postfix) with ESMTP for ; Wed, 18 Mar 2020 21:33:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: Content-Type:MIME-Version:Date:Message-ID:Subject:From:To:Sender:Reply-To:Cc: Content-ID:Content-Description:In-Reply-To:References; bh=7C99gg0dFQ88jekGFXdIQKCeI7+noYOSr4It/4IKhXs=; b=ix5Z/nym4gWSAkSZ3dwnCjogYk g5HR2B8EKYlPJK4VmyBlhL7mGkwQG3+OmTvnXENcd19BI/COJXrw0nvngsrx68Uxd94L9l/y3s2sy Nn6BZjIZAzT/UgoHNldFa6UrSGGbHygCxL713OcmqBp7g9RwCy46xDTYDHRksUdAOrtUjQoR6oT+w SAtYLEuiHIuGTs0GRPNQsvrb65dUWWmvrL9nARiblnFNgyuD6yF+/ZPTiT+YU4o2bRDhk2x9W7Ej+ fNR6Pjn2EUy0rGQn/b2Im/K3KWNmuib8j3OJSfuKI1m5jIOkyTvIfTQkig/3ZEAHxIdSKSZRcEeaG L5yHMdog==; Received: from [2601:1c0:6280:3f0::19c2] by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jEgJU-0007sv-7q; Wed, 18 Mar 2020 21:33:20 +0000 To: Linux MM , Andrew Morton , LKML From: Randy Dunlap Subject: [PATCH -next] mm/hugetlb.c: fix printk format warning for 32-bit phys_addr_t Message-ID: Date: Wed, 18 Mar 2020 14:33:19 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Randy Dunlap Fix printk format warnings when phys_addr_t is 32 bits, i.e., CONFIG_PHYS_ADDR_T_64BIT is not set/enabled. Fixes these build warnings: CC mm/hugetlb.o In file included from ../include/linux/printk.h:7:0, from ../include/linux/kernel.h:15, from ../include/linux/list.h:9, from ../mm/hugetlb.c:6: ../mm/hugetlb.c: In function =E2=80=98hugetlb_cma_reserve=E2=80=99: ../include/linux/kern_levels.h:5:18: warning: format =E2=80=98%llu=E2=80=99= expects argument of type =E2=80=98long long unsigned int=E2=80=99, but a= rgument 4 has type =E2=80=98unsigned int=E2=80=99 [-Wformat=3D] #define KERN_SOH "\001" /* ASCII Start Of Header */ ^ ../include/linux/kern_levels.h:12:22: note: in expansion of macro =E2=80=98= KERN_SOH=E2=80=99 #define KERN_WARNING KERN_SOH "4" /* warning conditions */ ^~~~~~~~ ../include/linux/printk.h:306:9: note: in expansion of macro =E2=80=98KER= N_WARNING=E2=80=99 printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) ^~~~~~~~~~~~ ../mm/hugetlb.c:5472:4: note: in expansion of macro =E2=80=98pr_warn=E2=80= =99 pr_warn("hugetlb_cma: reservation failed: err %d, node %d, [%llu, %ll= u)", ^~~~~~~ ../mm/hugetlb.c:5472:67: note: format string is defined here pr_warn("hugetlb_cma: reservation failed: err %d, node %d, [%llu, %ll= u)", ~~~^ %u In file included from ../include/linux/printk.h:7:0, from ../include/linux/kernel.h:15, from ../include/linux/list.h:9, from ../mm/hugetlb.c:6: ../include/linux/kern_levels.h:5:18: warning: format =E2=80=98%llu=E2=80=99= expects argument of type =E2=80=98long long unsigned int=E2=80=99, but a= rgument 5 has type =E2=80=98unsigned int=E2=80=99 [-Wformat=3D] #define KERN_SOH "\001" /* ASCII Start Of Header */ ^ ../include/linux/kern_levels.h:12:22: note: in expansion of macro =E2=80=98= KERN_SOH=E2=80=99 #define KERN_WARNING KERN_SOH "4" /* warning conditions */ ^~~~~~~~ ../include/linux/printk.h:306:9: note: in expansion of macro =E2=80=98KER= N_WARNING=E2=80=99 printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) ^~~~~~~~~~~~ ../mm/hugetlb.c:5472:4: note: in expansion of macro =E2=80=98pr_warn=E2=80= =99 pr_warn("hugetlb_cma: reservation failed: err %d, node %d, [%llu, %ll= u)", ^~~~~~~ ../mm/hugetlb.c:5472:73: note: format string is defined here pr_warn("hugetlb_cma: reservation failed: err %d, node %d, [%llu, %ll= u)", ~~~= ^ %u Signed-off-by: Randy Dunlap --- mm/hugetlb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- linux-next-20200318.orig/mm/hugetlb.c +++ linux-next-20200318/mm/hugetlb.c @@ -5469,8 +5469,10 @@ void __init hugetlb_cma_reserve(int orde 0, false, "hugetlb", &hugetlb_cma[nid]); if (res) { - pr_warn("hugetlb_cma: reservation failed: err %d, node %d, [%llu, %ll= u)", - res, nid, PFN_PHYS(min_pfn), PFN_PHYS(max_pfn)); + phys_addr_t begpa =3D PFN_PHYS(min_pfn); + phys_addr_t endpa =3D PFN_PHYS(max_pfn); + pr_warn("hugetlb_cma: reservation failed: err %d, node %d, [%pap, %pa= p)", + res, nid, &begpa, &endpa); break; } =20