The patch titled swsusp: Use memory bitmaps during resume (fix) has been removed from the -mm tree. Its filename is swsusp-use-memory-bitmaps-during-resume-fix.patch This patch was dropped because it was folded into swsusp-use-memory-bitmaps-during-resume.patch ------------------------------------------------------ Subject: swsusp: Use memory bitmaps during resume (fix) From: "Rafael J. Wysocki" <rjw@xxxxxxx> On Monday 14 August 2006 00:04, Andrew Morton wrote: > On Thu, 10 Aug 2006 15:23:41 +0200 > "Rafael J. Wysocki" <rjw@xxxxxxx> wrote: > > > Make swsusp use memory bitmaps to store its internal information during the > > resume phase of the suspend-resume cycle. > > This patch makes the resume-time disk IO go all slow again. > > Time to read 80k pages: > > 2.6.18-rc4: 24 seconds > 2.6.18-rc4+akpm-speedups: 10 seconds > 2.6.18-rc4+akpm-speedups+this-patch: 24 seconds Well, I removed one line too many, sorry. Cc: Pavel Machek <pavel@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- kernel/power/snapshot.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) diff -puN kernel/power/snapshot.c~swsusp-use-memory-bitmaps-during-resume-fix kernel/power/snapshot.c --- a/kernel/power/snapshot.c~swsusp-use-memory-bitmaps-during-resume-fix +++ a/kernel/power/snapshot.c @@ -1278,13 +1278,14 @@ int snapshot_write_next(struct snapshot_ chain_init(&ca, GFP_ATOMIC, PG_SAFE); memory_bm_position_reset(&orig_bm); restore_pblist = NULL; - handle->sync_read = 0; handle->buffer = get_buffer(&orig_bm, &ca); + handle->sync_read = 0; if (!handle->buffer) return -ENOMEM; } } else { handle->buffer = get_buffer(&orig_bm, &ca); + handle->sync_read = 0; } handle->prev = handle->cur; } _ Patches currently in -mm which might be from rjw@xxxxxxx are swsusp-write-timer.patch swsusp-write-speedup.patch swsusp-read-timer.patch swsusp-read-speedup.patch swsusp-clean-up-browsing-of-pfns.patch swsusp-struct-snapshot_handle-cleanup.patch make-swsusp-avoid-memory-holes-and-reserved-memory-regions-on-x86_64.patch disable-cpu-hotplug-during-suspend-2.patch swsusp-fix-mark_free_pages.patch swsusp-reorder-memory-allocating-functions.patch swsusp-fix-alloc_pagedir.patch clean-up-suspend-header.patch change-the-name-of-pagedir_nosave.patch swsusp-introduce-some-helpful-constants.patch swsusp-introduce-memory-bitmaps.patch swsusp-use-memory-bitmaps-during-resume.patch swsusp-use-memory-bitmaps-during-resume-fix.patch pm-make-it-possible-to-disable-console-suspending.patch pm-make-it-possible-to-disable-console-suspending-fix.patch pm-make-it-possible-to-disable-console-suspending-fix-2.patch make-it-possible-to-disable-serial-console-suspend.patch i386-detect-clock-skew-during-suspend.patch pm-add-pm_trace-switch.patch pm-add-pm_trace-switch-doc.patch reiserfs-make-sure-all-dentries-refs-are-released-before-calling-kill_block_super-try-2.patch ide-reprogram-disk-pio-timings-on-resume.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