Merge branch 'pm-sleep'
* pm-sleep: x86: Load __USER_DS into DS/ES after resume
This commit is contained in:
commit
3bcda76d9d
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue