diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-22 14:40:28 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-22 14:40:28 +0200 |
| commit | 3bcda76d9d1c0c4e70d5e3b7a962e46de2e79b61 (patch) | |
| tree | 2fa24cb3d42a643258185b5cade0787dc84f59e0 /arch/x86 | |
| parent | 1af858fdd2aa4107ff4e1c9fc1b23929d16a7491 (diff) | |
| parent | ffa64eff956a25548cad0391dbc14c672827be7b (diff) | |
| download | linux-3bcda76d9d1c0c4e70d5e3b7a962e46de2e79b61.tar.bz2 | |
Merge branch 'pm-sleep'
* pm-sleep:
x86: Load __USER_DS into DS/ES after resume
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/acpi/wakeup_32.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S index 665c6b7d2ea9..0c26b1b44e51 100644 --- a/arch/x86/kernel/acpi/wakeup_32.S +++ b/arch/x86/kernel/acpi/wakeup_32.S @@ -12,11 +12,13 @@ ENTRY(wakeup_pmode_return) wakeup_pmode_return: movw $__KERNEL_DS, %ax movw %ax, %ss - movw %ax, %ds - movw %ax, %es movw %ax, %fs movw %ax, %gs + movw $__USER_DS, %ax + movw %ax, %ds + movw %ax, %es + # reload the gdt, as we need the full 32 bit address lidt saved_idt lldt saved_ldt |