From: Pavel Machek <pavel@ucw.cz>
To: Ingo Molnar <mingo@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Denys Vlasenko <dvlasenk@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
the arch/x86 maintainers <x86@kernel.org>,
linux-pm@vger.kernel.org, "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Andy Lutomirski <luto@amacapital.net>,
Brian Gerst <brgerst@gmail.com>, Peter Anvin <hpa@zytor.com>
Subject: Re: [PATCH v2] x86: Load __USER_DS into DS/ES after resume
Date: Tue, 16 Jun 2015 11:13:33 +0200 [thread overview]
Message-ID: <20150616091333.GA6448@amd> (raw)
In-Reply-To: <20150614074922.GA30290@gmail.com>
> > That second KERNEL should be USER.
>
> Yeah, doh :-/ Updated patch below.
>
> Thanks,
>
> Ingo
Acked-by: Pavel Machek <pavel@ucw.cz>
Tested-by: Pavel Machek <pavel@ucw.cz>
[of course, it worked for me before, so I only tested it also works
with the patch.]
Rafael, can you apply it?
Pavel
> 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
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
next prev parent reply other threads:[~2015-06-16 9:13 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-11 23:45 [PATCH] x86: General protection fault after STR (32 bit systems only) Srinivas Pandruvada
2015-06-12 6:07 ` Ingo Molnar
2015-06-12 6:48 ` Andy Lutomirski
2015-06-12 7:15 ` Ingo Molnar
2015-06-12 7:41 ` Andy Lutomirski
2015-06-12 7:50 ` Ingo Molnar
2015-06-12 8:15 ` H. Peter Anvin
2015-06-12 8:36 ` Ingo Molnar
2015-06-12 15:48 ` Brian Gerst
2015-06-12 18:11 ` Andy Lutomirski
2015-06-12 18:31 ` Srinivas Pandruvada
2015-06-13 7:00 ` Ingo Molnar
2015-06-12 22:45 ` Denys Vlasenko
2015-06-13 14:20 ` Pavel Machek
2015-06-13 7:03 ` Ingo Molnar
2015-06-13 18:23 ` Andy Lutomirski
2015-06-13 21:30 ` Brian Gerst
2015-06-14 6:56 ` [PATCH] x86: Load __USER_DS into DS/ES after resume Ingo Molnar
2015-06-14 7:03 ` Pavel Machek
[not found] ` <CA+55aFzB9dYidEf_7Hs47FOF7WPPJnJQwj_RiwL--c5Gb1uqyw@mail.gmail.com>
2015-06-14 7:49 ` [PATCH v2] " Ingo Molnar
2015-06-14 8:57 ` Pavel Machek
2015-06-14 14:22 ` Brian Gerst
2015-06-15 16:12 ` Srinivas Pandruvada
2015-06-16 9:13 ` Pavel Machek [this message]
2015-06-16 21:40 ` Rafael J. Wysocki
2015-06-17 8:59 ` x86: allow using different kernel version for 32-bit, too Pavel Machek
2015-06-18 9:13 ` [PATCH v2] x86: Load __USER_DS into DS/ES after resume Ingo Molnar
2015-06-22 14:06 ` Rafael J. Wysocki
2015-06-12 16:15 ` [PATCH] x86: General protection fault after STR (32 bit systems only) Srinivas Pandruvada
2015-06-13 7:15 ` [PATCH, DEBUG] x86/32: Add small delay after resume Ingo Molnar
2015-06-15 16:10 ` Srinivas Pandruvada
2015-06-16 21:33 ` H. Peter Anvin
2015-06-16 22:25 ` Srinivas Pandruvada
2015-06-17 16:33 ` Konrad Rzeszutek Wilk
2015-06-17 17:22 ` H. Peter Anvin
2015-06-17 18:29 ` Konrad Rzeszutek Wilk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150616091333.GA6448@amd \
--to=pavel@ucw.cz \
--cc=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=dvlasenk@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-pm@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mingo@kernel.org \
--cc=mingo@redhat.com \
--cc=rjw@rjwysocki.net \
--cc=srinivas.pandruvada@linux.intel.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox