redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'pm-sleep'

Browse source 
* pm-sleep:
  x86: Load __USER_DS into DS/ES after resume
This commit is contained in:
Rafael J. Wysocki 2015-06-22 14:40:28 +02:00
parent 1af858fdd2 ffa64eff95
commit 3bcda76d9d
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/x86/kernel/acpi/wakeup_32.S
View file

@ -12,11 +12,13 @@ ENTRY(wakeup_pmode_return)
wakeup_pmode_return: wakeup_pmode_return:
movw $__KERNEL_DS, %ax movw $__KERNEL_DS, %ax
movw %ax, %ss movw %ax, %ss
movw %ax, %ds
movw %ax, %es
movw %ax, %fs movw %ax, %fs
movw %ax, %gs movw %ax, %gs
movw $__USER_DS, %ax
movw %ax, %ds
movw %ax, %es
# reload the gdt, as we need the full 32 bit address # reload the gdt, as we need the full 32 bit address
lidt saved_idt lidt saved_idt
lldt saved_ldt lldt saved_ldt