diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2012-09-26 18:02:34 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-09-26 18:06:22 -0400 |
| commit | 73201dbec64aebf6b0dca855b523f437972dc7bb (patch) | |
| tree | fdedca7d530ffda4fcb53cb084ad993555c2f948 /arch/x86/realmode/rm/wakeup.h | |
| parent | 5a5a51db78ef24aa61a4cb2ae36f07f6fa37356d (diff) | |
x86, suspend: On wakeup always initialize cr4 and EFER
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
Diffstat (limited to 'arch/x86/realmode/rm/wakeup.h')
| -rw-r--r-- | arch/x86/realmode/rm/wakeup.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/realmode/rm/wakeup.h b/arch/x86/realmode/rm/wakeup.h index 9317e0042f24..7dd86a419f5d 100644 --- a/arch/x86/realmode/rm/wakeup.h +++ b/arch/x86/realmode/rm/wakeup.h | |||
| @@ -36,5 +36,7 @@ extern struct wakeup_header wakeup_header; | |||
| 36 | 36 | ||
| 37 | /* Wakeup behavior bits */ | 37 | /* Wakeup behavior bits */ |
| 38 | #define WAKEUP_BEHAVIOR_RESTORE_MISC_ENABLE 0 | 38 | #define WAKEUP_BEHAVIOR_RESTORE_MISC_ENABLE 0 |
| 39 | #define WAKEUP_BEHAVIOR_RESTORE_CR4 1 | ||
| 40 | #define WAKEUP_BEHAVIOR_RESTORE_EFER 2 | ||
| 39 | 41 | ||
| 40 | #endif /* ARCH_X86_KERNEL_ACPI_RM_WAKEUP_H */ | 42 | #endif /* ARCH_X86_KERNEL_ACPI_RM_WAKEUP_H */ |