The patch titled Subject: swap-add-warning-if-swap-slots-cache-failed-to-initialize-fix has been removed from the -mm tree. Its filename was swap-add-warning-if-swap-slots-cache-failed-to-initialize-fix.patch This patch was dropped because it was folded into swap-add-warning-if-swap-slots-cache-failed-to-initialize.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: swap-add-warning-if-swap-slots-cache-failed-to-initialize-fix use WARN_ONCE return value, fix grammar in message Cc: Tim Chen <tim.c.chen@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/swap_slots.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff -puN mm/swap_slots.c~swap-add-warning-if-swap-slots-cache-failed-to-initialize-fix mm/swap_slots.c --- a/mm/swap_slots.c~swap-add-warning-if-swap-slots-cache-failed-to-initialize-fix +++ a/mm/swap_slots.c @@ -241,11 +241,10 @@ int enable_swap_slots_cache(void) ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "swap_slots_cache", alloc_swap_slot_cache, free_slot_cache); - if (ret < 0) { - WARN_ONCE(1, "Cache allocation failed (%s), operate without swap slots cache.\n", - __func__); + if (WARN_ONCE(ret < 0, "Cache allocation failed (%s), operating " + "without swap slots cache.\n", __func__)) goto out_unlock; - } + swap_slot_cache_initialized = true; __reenable_swap_slots_cache(); out_unlock: _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are swap-add-warning-if-swap-slots-cache-failed-to-initialize.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