]> err.no Git - linux-2.6/commit
i386: do not restore reserved memory after hibernation
authorRafael J. Wysocki <rjw@sisk.pl>
Sat, 21 Jul 2007 15:11:09 +0000 (17:11 +0200)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 22 Jul 2007 01:37:12 +0000 (18:37 -0700)
commit1c10070a55a38ad8489df8afd52c9a3ffd46bbb5
treee4c1ab4e436fbc3345cb465c8c896153f6a33ff3
parent114ab8e99c52828b37c994f580e39ce341c17d3b
i386: do not restore reserved memory after hibernation

On some systems the ACPI NVS area is located in the first 1 MB of RAM and
it is overwritten by the i386 code during the restore after hibernation.
This confuses the ACPI platform firmware that doesn't update the AC adapter
status appropriately as a result
(http://bugzilla.kernel.org/show_bug.cgi?id=7995).

The solution is to register the reserved memory in the first 1 MB as
'nosave', so that swsusp doesn't touch it during the restore.  Also, this
has been done on x86_64 for a long time now, so this patch makes the i386
restore code behave like the x86_64 one.

[akpm@linux-foundation.org: build fix]
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/i386/kernel/e820.c
arch/i386/kernel/setup.c
include/asm-i386/e820.h