x86, suspend: On wakeup always initialize cr4 and EFER

Browse source

We already have a flag word to indicate the existence of MISC_ENABLES,
so use the same flag word to indicate existence of cr4 and EFER, and
always restore them if they exist.  That way if something passes a
nonzero value when the value *should* be zero, we will still
initialize it.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Link: http://lkml.kernel.org/r/1348529239-17943-1-git-send-email-hpa@linux.intel.com

...

This commit is contained in:

H. Peter Anvin 2012-09-26 15:02:34 -07:00

parent 5a5a51db78

commit 73201dbec6

3 changed files with 31 additions and 15 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

15

arch/x86/kernel/acpi/sleep.c

View file

2

arch/x86/realmode/rm/wakeup.h

View file

29

arch/x86/realmode/rm/wakeup_asm.S

View file