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 tag 'trace-fixes-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
entry_32.S
diff --git
a/arch/x86/kernel/entry_32.S
b/arch/x86/kernel/entry_32.S
index
344b63f
..
1cf7c97
100644
(file)
--- a/
arch/x86/kernel/entry_32.S
+++ b/
arch/x86/kernel/entry_32.S
@@
-1191,10
+1191,10
@@
ENTRY(ftrace_graph_caller)
pushl %eax
pushl %ecx
pushl %edx
- movl 0xc(%esp), %e
d
x
- lea 0x4(%ebp), %e
a
x
+ movl 0xc(%esp), %e
a
x
+ lea 0x4(%ebp), %e
d
x
movl (%ebp), %ecx
- subl $MCOUNT_INSN_SIZE, %e
d
x
+ subl $MCOUNT_INSN_SIZE, %e
a
x
call prepare_ftrace_return
popl %edx
popl %ecx