diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-11 21:19:45 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-11 21:19:45 (GMT) |
| commit | 7ae1277a5202109a31d8f81ac99d4a53278dab84 (patch) | |
| tree | b32748f82150e4a37b2416ffc2d844cc7d9e7ee5 /arch/x86/include/asm/suspend_64.h | |
| parent | b25b550bb153626df6a48eb8583e923e3dfcf64a (diff) | |
| parent | 85a0e7539781dad4bfcffd98e72fa9f130f4e40d (diff) | |
| download | linux-fsl-qoriq-7ae1277a5202109a31d8f81ac99d4a53278dab84.tar.xz | |
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM / x86: Save/restore MISC_ENABLE register
Diffstat (limited to 'arch/x86/include/asm/suspend_64.h')
| -rw-r--r-- | arch/x86/include/asm/suspend_64.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/suspend_64.h b/arch/x86/include/asm/suspend_64.h index 06284f4..8d942af 100644 --- a/arch/x86/include/asm/suspend_64.h +++ b/arch/x86/include/asm/suspend_64.h @@ -27,6 +27,8 @@ struct saved_context { u16 ds, es, fs, gs, ss; unsigned long gs_base, gs_kernel_base, fs_base; unsigned long cr0, cr2, cr3, cr4, cr8; + u64 misc_enable; + bool misc_enable_saved; unsigned long efer; u16 gdt_pad; u16 gdt_limit; |