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

Merge branch 'pm-sleep'

* pm-sleep:
x86: Load __USER_DS into DS/ES after resume

Rafael J. Wysocki 3bcda76d 1af858fd

+4 -2
+4 -2
arch/x86/kernel/acpi/wakeup_32.S
··· 12 12 wakeup_pmode_return: 13 13 movw $__KERNEL_DS, %ax 14 14 movw %ax, %ss 15 - movw %ax, %ds 16 - movw %ax, %es 17 15 movw %ax, %fs 18 16 movw %ax, %gs 17 + 18 + movw $__USER_DS, %ax 19 + movw %ax, %ds 20 + movw %ax, %es 19 21 20 22 # reload the gdt, as we need the full 32 bit address 21 23 lidt saved_idt