All of
 help / color / mirror / Atom feed
From: Arnd Bergmann <>
To: "Andrew Morton" <>,
	"Stephen Rothwell" <>,
	"Jérôme Glisse" <>
Cc: Arnd Bergmann <>, Huang Ying <>,
	Johannes Weiner <>,
	Tim Chen <>,
	Minchan Kim <>,
Subject: [PATCH] mm: swap: make free_swap_and_cache()/swapcache_prepare() inline functions
Date: Wed, 23 Aug 2017 15:31:42 +0200	[thread overview]
Message-ID: <> (raw)

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'

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(-)

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)

             reply	other threads:[~2017-08-23 13:32 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-23 13:31 Arnd Bergmann [this message]
2017-08-23 18:27 ` Jerome Glisse

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \ \
    --subject='Re: [PATCH] mm: swap: make free_swap_and_cache()/swapcache_prepare() inline functions' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.