From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 18 Jul 2010 22:13:30 +0000 (-0700)
Subject: Merge branch 'x86/kprobes' of git://git.kernel.org/pub/scm/linux/kernel/git/frob... 
X-Git-Tag: v2.6.35-rc6~32
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=a9f7f2e74ae0e6a801a2433dc8e9124d73da0cb4;hp=2044f2282d7558c765270d78e19dbdcf6190ca71;p=net-next-2.6.git

Merge branch 'x86/kprobes' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland

* 'x86/kprobes' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland:
  x86: kprobes: fix swapped segment registers in kretprobe
---

diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
index 345a4b1fe14..675879b65ce 100644
--- a/arch/x86/kernel/kprobes.c
+++ b/arch/x86/kernel/kprobes.c
@@ -640,8 +640,8 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
 	/* Skip cs, ip, orig_ax and gs. */	\
 	"	subl $16, %esp\n"	\
 	"	pushl %fs\n"		\
-	"	pushl %ds\n"		\
 	"	pushl %es\n"		\
+	"	pushl %ds\n"		\
 	"	pushl %eax\n"		\
 	"	pushl %ebp\n"		\
 	"	pushl %edi\n"		\