Hugh Dickins 910321ea81 swap: revert special hibernation allocation ... Please revert 2.6.36-rc commit d2997b1042 "hibernation: freeze swap at hibernation". It complicated matters by adding a second swap allocation path, just for hibernation; without in any way fixing the issue that it was intended to address - page reclaim after fixing the hibernation image might free swap from a page already imaged as swapcache, letting its swap be reallocated to store a different page of the image: resulting in data corruption if the imaged page were freed as clean then swapped back in. Pages freed to si->swap_map were still in danger of being reallocated by the alternative allocation path. I guess it inadvertently fixed slow SSD swap allocation for hibernation, as reported by Nigel Cunningham: by missing out the discards that occur on the usual swap allocation path; but that was unintentional, and needs a separate fix. Signed-off-by: Hugh Dickins <hughd@google.com> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> Cc: Ondrej Zary <linux@rainbow-software.org> Cc: Andrea Gelmini <andrea.gelmini@gmail.com> Cc: Balbir Singh <balbir@in.ibm.com> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: Nigel Cunningham <nigel@tuxonice.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2010-09-09 18:57:25 -07:00
..
acpi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2010-09-07 16:00:17 -07:00
asm-generic	gpio: doc updates	2010-09-09 18:57:24 -07:00
crypto
drm	Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2010-08-23 18:28:03 -07:00
keys	DNS: Separate out CIFS DNS Resolver code	2010-08-05 17:17:51 +00:00
linux	swap: revert special hibernation allocation	2010-09-09 18:57:25 -07:00
math-emu	math-emu: correct test for downshifting fraction in _FP_FROM_INT()	2010-07-20 18:45:14 -07:00
media	V4L/DVB: cx2341x: convert to the control framework	2010-08-08 23:43:05 -03:00
mtd	mtd: Update copyright notices	2010-08-08 20:58:20 +01:00
net	tcp: Combat per-cpu skew in orphan tests.	2010-08-25 02:27:49 -07:00
pcmcia	pcmcia: use struct resource for PCMCIA devices, part 2	2010-08-03 09:04:16 +02:00
rdma	IB: Rename RAW_ETY to RAW_ETHERTYPE	2010-08-04 10:44:19 -07:00
rxrpc
scsi	scsi: use __uX types for headers exported to user space	2010-08-11 08:59:01 -07:00
sound	ALSA: emu10k1 - delay the PCM interrupts (add pcm_irq_delay parameter)	2010-08-18 15:10:59 +02:00
trace	Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-08-24 12:21:49 -07:00
video	include: replace unifdef-y with header-y	2010-08-14 22:26:51 +02:00
xen	xen: pvhvm: make it clearer that XEN_UNPLUG_* define bits in a bitfield	2010-08-23 12:01:35 +01:00
Kbuild