diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-18 15:13:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-18 15:13:30 -0700 |
| commit | a9f7f2e74ae0e6a801a2433dc8e9124d73da0cb4 (patch) | |
| tree | a52644367533e48d9fe4f4abea0c8b39dc2523e2 /arch/x86 | |
| parent | 2044f2282d7558c765270d78e19dbdcf6190ca71 (diff) | |
| parent | a197479848a2f1a2a5c07cffa6c31ab5e8c82797 (diff) | |
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
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/kprobes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c index 345a4b1fe144..675879b65ce6 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" \ |