The patch titled
Subject: mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix
has been removed from the -mm tree. Its filename was
mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix.patch
This patch was dropped because it was folded into mm-swap-fix-race-conditions-in-swap_slots-cache-init.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix
tidy up comment
Cc: Tim Chen <tim.c.chen@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/swap_slots.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff -puN mm/swap_slots.c~mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix mm/swap_slots.c
--- a/mm/swap_slots.c~mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix
+++ a/mm/swap_slots.c
@@ -150,11 +150,10 @@ static int alloc_swap_slot_cache(unsigne
cache->cur = 0;
cache->n_ret = 0;
/*
- * We intialized alloc_lock and free_lock earlier.
- * We use !cache->slots or !cache->slots_ret
- * to know if it is safe to acquire the corresponding
- * lock and use the cache. Memory barrier
- * below ensures the assumption.
+ * We intialized alloc_lock and free_lock earlier. We use
+ * !cache->slots or !cache->slots_ret to know if it is safe to acquire
+ * the corresponding lock and use the cache. Memory barrier below
+ * ensures the assumption.
*/
mb();
cache->slots = slots;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
include-linux-sched-mmh-uninline-mmdrop_async-etc.patch
mm-swap-fix-race-conditions-in-swap_slots-cache-init.patch
mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix-fix.patch
f2fs-simplify-page-iteration-loops-fix.patch
mm-consolidate-page-table-accounting-fix-fix.patch
mm-stop-zeroing-memory-during-allocation-in-vmemmap-fix.patch
mm-batch-radix-tree-operations-when-truncating-pages-fix-fix.patch
mm-simplify-nodemask-printing-fix.patch
mm-make-alloc_node_mem_map-a-voidcall-if-we-dont-have-config_flat_node_mem_map-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
