From patchwork Thu May 4 20:52:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98576 Delivered-To: patch@linaro.org Received: by 10.140.89.200 with SMTP id v66csp806376qgd; Thu, 4 May 2017 13:52:27 -0700 (PDT) X-Received: by 10.98.214.193 with SMTP id a62mr10198067pfl.40.1493931147623; Thu, 04 May 2017 13:52:27 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x7si3136031pls.89.2017.05.04.13.52.27; Thu, 04 May 2017 13:52:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751393AbdEDUw0 (ORCPT + 6 others); Thu, 4 May 2017 16:52:26 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:54823 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751353AbdEDUwZ (ORCPT ); Thu, 4 May 2017 16:52:25 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0Mhr3z-1dRbuw26Db-00MvBK; Thu, 04 May 2017 22:52:21 +0200 From: Arnd Bergmann To: gregkh@linuxfoundation.org Cc: stable@vger.kernel.org, Stephen Rothwell , Andrew Morton , Linus Torvalds , Arnd Bergmann Subject: [PATCH 13/13] [3.18-stable] mm/cma: silence warnings due to max() usage Date: Thu, 4 May 2017 22:52:09 +0200 Message-Id: <20170504205209.498721-14-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170504205209.498721-1-arnd@arndb.de> References: <20170504205209.498721-1-arnd@arndb.de> X-Provags-ID: V03:K0:kcd97owqD3TFxWJk1/nFiBPprdNT84ehX2ZYN2f2TBtuYcqNr7M 3w1eQo0+3OJEjBWgFI3v7i9z+1IybAsj1qz+7WY/ynbRdWlfBJTaWDm2vJtYDU+aZcbBnH4 Gob0917F5qJ0dCSFODqOQq7v2IUeErK0UHMHJGhmKAzrSt+9bAAbB4p8awfaM9roJqsJEce xxvEolbu35zYDqc0Vm4Zw== X-UI-Out-Filterresults: notjunk:1; V01:K0:2oDjRsES+4Y=:Pa2RZ47f+ewxheCuwDdgHu X+OqPwXt/VFZlUnJG2IxsYJuU+cX6zlp47hUhiB+zCFk/dSFvTZNX3KRYvHIBepAVQcz6YcJa UHA5q+Z6+ZbL6FChCKo+7y94qAiEYt4FQrZj76g1A4i2UdYNFi7Yg8FR4nhp0wKWN4gF+S4Q3 R9J0/u7TnoMUY8CPBGaNPxFPCBx/4qS64Nk3edB/8dqWD3KHAFMwf58sTu9b+Gd1Sxih1N/AU Djcx9qC8jYLBuI2xPcnfdIKEY5DStCJIYwR+B0wb+cu1QZ/1fOGKp52O2W8I69fim+gL8obtW 7LaGEqC4p177ObwWXF84a6P5KZ1zvOu/xK3K4OtsiP8n80LV2P99aV+vB6H5DGbfAOlRMmAnp eVZllrqc4ZD8GWOq52eO/RhFoHL7L/zyC5S/WpspEQuisl9MBpg2rpVrTrTVkC6wXEedDZeNu QNE92TrO7zASKqFokYhuj9mrQ7EDli5n/723di3NNl+703EA7JAtncewLq75+K90528viJRcB U5Y4lvuBbga/xX7dD8wzz3ClXrpkdiv9WDDxr1zmUE7ZnPcE4Qwz745ShlbdAR9u6mMC1lQdC 3riBsKDJZgDe/smYoVc961c7pjIksnJRa3+lDKisfICWx2NHsv1jUIrF9AY8oXdjB5fLkTm0f H23I2JoHnv/qTHGZsskH7ccMV2yzPDbBBrMITaZHFLuVEBzQimuKgxkv0+Ymm22OD4m0= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Stephen Rothwell Commit badbda53e505089062e194c614e6f23450bc98b2 upstream. pageblock_order can be (at least) an unsigned int or an unsigned long depending on the kernel config and architecture, so use max_t(unsigned long, ...) when comparing it. fixes these warnings: In file included from include/asm-generic/bug.h:13:0, from arch/powerpc/include/asm/bug.h:127, from include/linux/bug.h:4, from include/linux/mmdebug.h:4, from include/linux/mm.h:8, from include/linux/memblock.h:18, from mm/cma.c:28: mm/cma.c: In function 'cma_init_reserved_mem': include/linux/kernel.h:748:17: warning: comparison of distinct pointer types lacks a cast (void) (&_max1 == &_max2); ^ mm/cma.c:186:27: note: in expansion of macro 'max' alignment = PAGE_SIZE << max(MAX_ORDER - 1, pageblock_order); ^ mm/cma.c: In function 'cma_declare_contiguous': include/linux/kernel.h:748:17: warning: comparison of distinct pointer types lacks a cast (void) (&_max1 == &_max2); ^ include/linux/kernel.h:747:9: note: in definition of macro 'max' typeof(y) _max2 = (y); ^ mm/cma.c:270:29: note: in expansion of macro 'max' (phys_addr_t)PAGE_SIZE << max(MAX_ORDER - 1, pageblock_order)); ^ include/linux/kernel.h:748:17: warning: comparison of distinct pointer types lacks a cast (void) (&_max1 == &_max2); ^ include/linux/kernel.h:747:21: note: in definition of macro 'max' typeof(y) _max2 = (y); ^ mm/cma.c:270:29: note: in expansion of macro 'max' (phys_addr_t)PAGE_SIZE << max(MAX_ORDER - 1, pageblock_order)); ^ [akpm@linux-foundation.org: coding-style fixes] Link: http://lkml.kernel.org/r/20160526150748.5be38a4f@canb.auug.org.au Signed-off-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Arnd Bergmann --- mm/cma.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/mm/cma.c b/mm/cma.c index 8e9ec13d31db..0f4549cf796f 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -168,7 +168,8 @@ int __init cma_init_reserved_mem(phys_addr_t base, phys_addr_t size, return -EINVAL; /* ensure minimal alignment requied by mm core */ - alignment = PAGE_SIZE << max(MAX_ORDER - 1, pageblock_order); + alignment = PAGE_SIZE << + max_t(unsigned long, MAX_ORDER - 1, pageblock_order); /* alignment should be aligned with order_per_bit */ if (!IS_ALIGNED(alignment >> PAGE_SHIFT, 1 << order_per_bit)) @@ -250,8 +251,8 @@ int __init cma_declare_contiguous(phys_addr_t base, * migratetype page by page allocator's buddy algorithm. In the case, * you couldn't get a contiguous memory, which is not what we want. */ - alignment = max(alignment, - (phys_addr_t)PAGE_SIZE << max(MAX_ORDER - 1, pageblock_order)); + alignment = max(alignment, (phys_addr_t)PAGE_SIZE << + max_t(unsigned long, MAX_ORDER - 1, pageblock_order)); base = ALIGN(base, alignment); size = ALIGN(size, alignment); limit &= ~(alignment - 1);