The patch titled Subject: mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix has been added to the -mm tree. Its filename is mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ 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 @@ -149,11 +149,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 i-need-old-gcc.patch scripts-spellingtxt-add-more-spelling-mistakes-to-spellingtxt-fix.patch mm-oom_reaper-skip-mm-structs-with-mmu-notifiers-checkpatch-fixes.patch of-provide-of_n_addrsize_cells-wrappers-for-config_of-fix.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch mm.patch include-linux-sched-mmh-uninline-mmdrop_async-etc.patch mm-sysctl-make-numa-stats-configurable-fix.patch mm-sysctl-make-numa-stats-configurable-fix-fix.patch mm-mmu_notifier-avoid-double-notification-when-it-is-useless-checkpatch-fixes.patch mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix.patch kernel-reboot-add-devm_register_reboot_notifier-fix.patch sysvipc-unteach-ids-next_id-for-checkpoint_restore-checkpatch-fixes.patch sysvipc-make-get_maxid-o1-again-checkpatch-fixes.patch linux-next-rejects.patch linux-next-git-rejects.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.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