tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 7ae1277a b25b550b

+8
+2
arch/x86/include/asm/suspend_32.h
··· 15 15 struct saved_context { 16 16 u16 es, fs, gs, ss; 17 17 unsigned long cr0, cr2, cr3, cr4; 18 + u64 misc_enable; 19 + bool misc_enable_saved; 18 20 struct desc_ptr gdt; 19 21 struct desc_ptr idt; 20 22 u16 ldt;
+2
arch/x86/include/asm/suspend_64.h
··· 27 27 u16 ds, es, fs, gs, ss; 28 28 unsigned long gs_base, gs_kernel_base, fs_base; 29 29 unsigned long cr0, cr2, cr3, cr4, cr8; 30 + u64 misc_enable; 31 + bool misc_enable_saved; 30 32 unsigned long efer; 31 33 u16 gdt_pad; 32 34 u16 gdt_limit;
+4
arch/x86/power/cpu.c
··· 105 105 ctxt->cr4 = read_cr4(); 106 106 ctxt->cr8 = read_cr8(); 107 107 #endif 108 + ctxt->misc_enable_saved = !rdmsrl_safe(MSR_IA32_MISC_ENABLE, 109 + &ctxt->misc_enable); 108 110 } 109 111 110 112 /* Needed by apm.c */ ··· 154 152 */ 155 153 static void __restore_processor_state(struct saved_context *ctxt) 156 154 { 155 + if (ctxt->misc_enable_saved) 156 + wrmsrl(MSR_IA32_MISC_ENABLE, ctxt->misc_enable); 157 157 /* 158 158 * control registers 159 159 */