x86: Fix S4 regression
commit83643e5d134408e61504caa4e3e9dd776ddd4207
authorTakashi Iwai <tiwai@suse.de>
Sun, 23 Oct 2011 21:19:12 +0000 (23 23:19 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 25 Oct 2011 05:10:16 +0000 (25 07:10 +0200)
tree50e31a4b43609ec480915363b5fad876b5da75ca
parentf92a292abeee48559493433e4e947d0f49fcdd8d
x86: Fix S4 regression

commit 8548c84da2f47e71bbbe300f55edb768492575f7 upstream.

Commit 4b239f458 ("x86-64, mm: Put early page table high") causes a S4
regression since 2.6.39, namely the machine reboots occasionally at S4
resume.  It doesn't happen always, overall rate is about 1/20.  But,
like other bugs, once when this happens, it continues to happen.

This patch fixes the problem by essentially reverting the memory
assignment in the older way.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Yinghai Lu <yinghai.lu@oracle.com>
[ We'll hopefully find the real fix, but that's too late for 3.1 now ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
arch/x86/mm/init.c