From patchwork Wed Aug 23 13:31:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 110832 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp4135344qge; Wed, 23 Aug 2017 06:32:41 -0700 (PDT) X-Received: by 10.98.70.151 with SMTP id o23mr1700721pfi.34.1503495161547; Wed, 23 Aug 2017 06:32:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503495161; cv=none; d=google.com; s=arc-20160816; b=y1Z7So9qzkXV6c9fqW7/O+gtc44+XCM6z9Oiyyl7x8MPRTvZUiqGI63ar9a3Ns2msm TyFVZ9YRIY37auex63PeMZc3Oy5vjMI6W43yXoAK8ElMWtcbbZU39bP4wAXaXxYzJrYB mk593NkkpiPhDN67vz9NwBFe06ExRwtlxfLMF85V9eGT8fDkD8tiWofuksLYJzi+dzlW gi9VdU3H8wJ7hlkojUL6wI4iW05gZGWWToguJAeUM3oVXb+iXZ4K5szMlBx/gWr1V4MW w43T/xrsVzJ0hUGm1erv9um4glljJsq/wdCjtEFC+DWMm/W0e7sLaRLWzWvr6YqUCF68 qEwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=AuMfrQMmCS0EUQNcQp4dzeSSIsM5yx78pg6P96wueco=; b=aB1jB386wWm+iGYysn1MaM28G26ia6944CbstOhWl5+0Uvw4IeWN0135sx6Gf3Yjh2 o3cuDnXEh/bDsFZtN279GD1FbDLfZT5xbPecV8zURxrK+RYjqH4kkVESIqYxCf0NmzfG kawwm6ehsKhiZ06Cq9ZPoZjqegXc8u4U0xD/T+BiaPdrJCkBL2J8tOHe7LXpMMnie7pM 8SOdfFal8DZxC1/yJoGNRZw0rWSt9i/PIbFFayPZGJnKs65USU9B/dc+mf3SdxnVA3qd AaCIeEjnMwZS2TwApjCCw73VCC62Mutl3cpQ2Lgm8HWhC/eGdn/Vl6ymADglpBLL0RG0 DXaQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k4si1077460pfg.272.2017.08.23.06.32.41; Wed, 23 Aug 2017 06:32:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754106AbdHWNcj (ORCPT + 26 others); Wed, 23 Aug 2017 09:32:39 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:49270 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754033AbdHWNcf (ORCPT ); Wed, 23 Aug 2017 09:32:35 -0400 Received: from wuerfel.lan ([95.208.190.237]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.145]) with ESMTPA (Nemesis) id 0MF9xL-1dn2ja1UeR-00GLW4; Wed, 23 Aug 2017 15:32:17 +0200 From: Arnd Bergmann To: Andrew Morton , Stephen Rothwell , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= Cc: Arnd Bergmann , Huang Ying , Johannes Weiner , Tim Chen , Minchan Kim , linux-kernel@vger.kernel.org Subject: [PATCH] mm: swap: make free_swap_and_cache()/swapcache_prepare() inline functions Date: Wed, 23 Aug 2017 15:31:42 +0200 Message-Id: <20170823133213.712917-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:e83MUH+RNCRvyHqrkMbqoJcK5GfElSo/cJAJKgPFXILF4OtXljQ /7aKxh4F8w3CwgjGq5Qq7putSMJfXL8sfaF6kT+9NbS7+Cctl5QnYlaZYV+BLDrtqFho8mP AUqhdZdd4DD5FQa3Q011qHw+9MYk5CoaSiNI77SolW7n46tC56YzpCxsWcejTBgQfEvi3Ic Hbn8HsS5Tq8MB9VvhvBoA== X-UI-Out-Filterresults: notjunk:1; V01:K0:I4LbrR8mhcs=:OAmB/y98okgA+ok8CUvx2l 9KPllwTxKtl8nmpctlJhSkesUcqjMC2k7Oi2t93vjKzbN//A0U6QwRdWNbspD9jRPRg+hBVf5 sCZ5GHPbYkQm5I36wKwZYMRqeslrPaayq8TTXfzMKBESUhNkL/xgrjOOdiLK8f9sz8SZCIYOf T/oan6XA5AM9zJcLpFUMUQyFbP1oOQYUyH9Iq/WNIzzbrlzShIRBdSRk2iT4sBCwKCCwLbtQy i/c/b0FjAl1V5L/XMTn58bhMsXkBbFwNYg33LRU4PPvRHn5LVu7tSPNDre61XoEt0IYuLEorP XQirkX+C1oxTARgd4k/N0uerc5oNbRdq4KbSR7zcVaCvx1tFVCG07LSSSnXfm6WqesBEwnUn3 Fj/dPK5+JrYyX9dSR8XKBd66HBqySii+eZMqMcFHpAYCkmRrx1D6NBRTX5FnkVq12sFonOhLg 0OvQdEVq4fd5OIyg0oZPWeff8dB5gprFv7hhwUUQqiCetPw8dxFk+aWoiQqnMeMQG9CJc5peK qaonpNY74Q0YRk3xKL81n278o6DfPf5H/HdGYQ85Z411hm/xEm0513Dpy4WGmgTwoXglQ0YAq S+/60myKzUkFI4TKRyQZqqYMSVVvUJO2vxqPPdTiyfjojqLXN8ypoRUavlCfDe7CIwIlrMtTJ RlobyL9EeI0ZoM19Ypa6N97QHCkW51EEklghJcVzMnwunPVmLis0dRVz/MkGkM5qb7ytuOwZf 1u0ciaqIgnibE1BaT7a3RcopFgE4oWqrF1kn/g== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We get a build warning from a boolean expression that is never used: mm/madvise.c: In function 'madvise_free_pte_range': include/linux/swap.h:490:55: error: value computed is not used [-Werror=unused-value] #define free_swap_and_cache(e) (is_migration_entry(e) || is_device_private_entry(e)) ^~ mm/madvise.c:353:4: note: in expansion of macro 'free_swap_and_cache' free_swap_and_cache(entry); This changes the two macros to a compound expression that gcc does not warn about. Changing them to inline functions would have been nicer but is not possible here because that would introduce a recursive header file dependency. Fixes: mmotm ("mm/ZONE_DEVICE: new type of ZONE_DEVICE for unaddressable memory") Signed-off-by: Arnd Bergmann --- include/linux/swap.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 Reviewed-by: Jérôme Glisse diff --git a/include/linux/swap.h b/include/linux/swap.h index 2be396acdf48..8a807292037f 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -487,8 +487,8 @@ static inline void show_swap_cache_info(void) { } -#define free_swap_and_cache(e) (is_migration_entry(e) || is_device_private_entry(e)) -#define swapcache_prepare(e) (is_migration_entry(e) || is_device_private_entry(e)) +#define free_swap_and_cache(e) ({(is_migration_entry(e) || is_device_private_entry(e));}) +#define swapcache_prepare(e) ({(is_migration_entry(e) || is_device_private_entry(e));}) static inline int add_swap_count_continuation(swp_entry_t swp, gfp_t gfp_mask) {