The patch titled
Subject: mm: swap: make free_swap_and_cache()/swapcache_prepare() inline functions
has been removed from the -mm tree. Its filename was
mm-zone_device-new-type-of-zone_device-for-unaddressable-memory-fix.patch
This patch was dropped because it was folded into mm-zone_device-new-type-of-zone_device-for-unaddressable-memory-v5.patch
------------------------------------------------------
From: Arnd Bergmann <arnd@xxxxxxxx>
Subject: mm: swap: make free_swap_and_cache()/swapcache_prepare() inline functions
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.
Link: http://lkml.kernel.org/r/20170823133213.712917-1-arnd@xxxxxxxx
Fixes: mmotm ("mm/ZONE_DEVICE: new type of ZONE_DEVICE for unaddressable memory")
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Reviewed-by: Jérôme Glisse <jglisse@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/swap.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN include/linux/swap.h~mm-zone_device-new-type-of-zone_device-for-unaddressable-memory-fix include/linux/swap.h
--- a/include/linux/swap.h~mm-zone_device-new-type-of-zone_device-for-unaddressable-memory-fix
+++ a/include/linux/swap.h
@@ -487,8 +487,8 @@ static inline void show_swap_cache_info(
{
}
-#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)
{
_
Patches currently in -mm which might be from arnd@xxxxxxxx are
mm-zone_device-new-type-of-zone_device-for-unaddressable-memory-v5.patch
fs-proc-remove-priv-argument-from-is_stack-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
