From: tip-bot for Brian Gerst <brgerst@gmail.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
brgerst@gmail.com, tglx@linutronix.de, mingo@elte.hu
Subject: [tip:x86/asm] x86, 64-bit: Fix bstep_iret jump
Date: Wed, 4 Nov 2009 06:33:42 GMT [thread overview]
Message-ID: <tip-97829de5a3b88899c5f3ac8802d11868bf4180ba@git.kernel.org> (raw)
In-Reply-To: <1257274925-15713-1-git-send-email-brgerst@gmail.com>
Commit-ID: 97829de5a3b88899c5f3ac8802d11868bf4180ba
Gitweb: http://git.kernel.org/tip/97829de5a3b88899c5f3ac8802d11868bf4180ba
Author: Brian Gerst <brgerst@gmail.com>
AuthorDate: Tue, 3 Nov 2009 14:02:05 -0500
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 3 Nov 2009 20:50:02 +0100
x86, 64-bit: Fix bstep_iret jump
This jump should be unconditional.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
LKML-Reference: <1257274925-15713-1-git-send-email-brgerst@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/kernel/entry_64.S | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index af0f4b2..1579a6c 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -1501,7 +1501,7 @@ error_kernelspace:
bstep_iret:
/* Fix truncated RIP */
movq %rcx,RIP+8(%rsp)
- je error_swapgs
+ jmp error_swapgs
END(error_entry)
prev parent reply other threads:[~2009-11-04 6:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-03 17:55 [PATCH] x86, 64-bit: Move K8 B step iret fixup to fault entry asm (v2) Brian Gerst
2009-11-03 18:10 ` Ingo Molnar
2009-11-03 18:39 ` Brian Gerst
2009-11-03 19:02 ` [PATCH] x86, 64-bit: Fix bstep_iret jump Brian Gerst
2009-11-04 6:33 ` tip-bot for Brian Gerst [this message]
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=tip-97829de5a3b88899c5f3ac8802d11868bf4180ba@git.kernel.org \
--to=brgerst@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.