git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into perf/core
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
kprobes.c
diff --git
a/arch/x86/kernel/kprobes.c
b/arch/x86/kernel/kprobes.c
index
175f85c
..
1bfb6cf
100644
(file)
--- a/
arch/x86/kernel/kprobes.c
+++ b/
arch/x86/kernel/kprobes.c
@@
-642,8
+642,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" \