Commit a9f7f2e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2044f228 a1974798
...@@ -640,8 +640,8 @@ static int __kprobes kprobe_handler(struct pt_regs *regs) ...@@ -640,8 +640,8 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
/* Skip cs, ip, orig_ax and gs. */ \ /* Skip cs, ip, orig_ax and gs. */ \
" subl $16, %esp\n" \ " subl $16, %esp\n" \
" pushl %fs\n" \ " pushl %fs\n" \
" pushl %ds\n" \
" pushl %es\n" \ " pushl %es\n" \
" pushl %ds\n" \
" pushl %eax\n" \ " pushl %eax\n" \
" pushl %ebp\n" \ " pushl %ebp\n" \
" pushl %edi\n" \ " pushl %edi\n" \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment