Subject: [folded-merged] mm-compaction-properly-signal-and-act-upon-lock-and-need_sched-contention-fix-2.patch removed from -mm tree To: vbabka@xxxxxxx,fabio.estevam@xxxxxxxxxxxxx,khilman@xxxxxxxxxx,rientjes@xxxxxxxxxx,sfr@xxxxxxxxxxxxxxxx,shawn.guo@xxxxxxxxxx,swarren@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Wed, 04 Jun 2014 15:48:29 -0700 The patch titled Subject: mm-compaction-properly-signal-and-act-upon-lock-and-need_sched-contention-fix-2 has been removed from the -mm tree. Its filename was mm-compaction-properly-signal-and-act-upon-lock-and-need_sched-contention-fix-2.patch This patch was dropped because it was folded into mm-compaction-properly-signal-and-act-upon-lock-and-need_sched-contention.patch ------------------------------------------------------ From: Vlastimil Babka <vbabka@xxxxxxx> Subject: mm-compaction-properly-signal-and-act-upon-lock-and-need_sched-contention-fix-2 Step 1: Change function name and comment between v1 and v2 so that the return value signals the opposite thing. Step 2: Change the call sites to reflect the opposite return value. Step 3: ??? Step 4: Make a complete fool of yourself. Signed-off-by: Vlastimil Babka <vbabka@xxxxxxx> Reported-by: Kevin Hilman <khilman@xxxxxxxxxx> Reported-by: Shawn Guo <shawn.guo@xxxxxxxxxx> Tested-by: Shawn Guo <shawn.guo@xxxxxxxxxx> Tested-by: Kevin Hilman <khilman@xxxxxxxxxx> Tested-by: Stephen Warren <swarren@xxxxxxxxxx> Tested-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx> Acked-by: David Rientjes <rientjes@xxxxxxxxxx> Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/compaction.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN mm/compaction.c~mm-compaction-properly-signal-and-act-upon-lock-and-need_sched-contention-fix-2 mm/compaction.c --- a/mm/compaction.c~mm-compaction-properly-signal-and-act-upon-lock-and-need_sched-contention-fix-2 +++ a/mm/compaction.c @@ -237,13 +237,13 @@ static inline bool compact_should_abort( if (need_resched()) { if (cc->mode == MIGRATE_ASYNC) { cc->contended = true; - return false; + return true; } cond_resched(); } - return true; + return false; } /* Returns true if the page is within a block suitable for migration to */ _ Patches currently in -mm which might be from vbabka@xxxxxxx are mm-page_alloc-prevent-migrate_reserve-pages-from-being-misplaced.patch mm-compaction-clean-up-unused-code-lines.patch mm-compaction-cleanup-isolate_freepages.patch mm-migration-add-destination-page-freeing-callback.patch mm-compaction-return-failed-migration-target-pages-back-to-freelist.patch mm-compaction-add-per-zone-migration-pfn-cache-for-async-compaction.patch mm-compaction-embed-migration-mode-in-compact_control.patch mm-thp-avoid-excessive-compaction-latency-during-fault.patch mm-compaction-terminate-async-compaction-when-rescheduling.patch mm-compaction-do-not-count-migratepages-when-unnecessary.patch mm-compaction-avoid-rescanning-pageblocks-in-isolate_freepages.patch jump_label-expose-the-reference-count.patch mm-page_alloc-use-jump-labels-to-avoid-checking-number_of_cpusets.patch mm-page_alloc-only-check-the-zone-id-check-if-pages-are-buddies.patch mm-page_alloc-only-check-the-alloc-flags-and-gfp_mask-for-dirty-once.patch mm-page_alloc-take-the-alloc_no_watermark-check-out-of-the-fast-path.patch mm-page_alloc-use-word-based-accesses-for-get-set-pageblock-bitmaps.patch mm-page_alloc-reduce-number-of-times-page_to_pfn-is-called.patch mm-page_alloc-lookup-pageblock-migratetype-with-irqs-enabled-during-free.patch mm-page_alloc-use-unsigned-int-for-order-in-more-places.patch mm-page_alloc-convert-hot-cold-parameter-and-immediate-callers-to-bool.patch mm-shmem-avoid-atomic-operation-during-shmem_getpage_gfp.patch mm-do-not-use-atomic-operations-when-releasing-pages.patch mm-do-not-use-unnecessary-atomic-operations-when-adding-pages-to-the-lru.patch fs-buffer-do-not-use-unnecessary-atomic-operations-when-discarding-buffers.patch mm-non-atomically-mark-page-accessed-during-page-cache-allocation-where-possible.patch mm-page_alloc-calculate-classzone_idx-once-from-the-zonelist-ref.patch mm-compaction-properly-signal-and-act-upon-lock-and-need_sched-contention.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