Commit a9f7f2e7 authored Jul 18, 2010 by Linus Torvalds

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

arch/x86/kernel/kprobes.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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" \