diff options
| author | Ingo Molnar | 2009-06-07 12:22:15 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2009-06-07 12:22:15 +0200 |
| commit | 5f4457a4f62cc9d78e04c0eb12ff0540899aad89 (patch) | |
| tree | 0b973d527ea6b2ae31e08da0746b4965a3c5a6d8 /arch/x86/kernel/ftrace.c | |
| parent | x86: fixup numa_node information for AMD CPU northbridge functions (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anh... (diff) | |
| download | kernel-qcow2-linux-5f4457a4f62cc9d78e04c0eb12ff0540899aad89.tar.gz kernel-qcow2-linux-5f4457a4f62cc9d78e04c0eb12ff0540899aad89.tar.xz kernel-qcow2-linux-5f4457a4f62cc9d78e04c0eb12ff0540899aad89.zip | |
Merge branch 'linus' into x86/cpu
Diffstat (limited to 'arch/x86/kernel/ftrace.c')
| -rw-r--r-- | arch/x86/kernel/ftrace.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 70a10ca100f6..b79c5533c421 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -18,6 +18,8 @@ #include <linux/init.h> #include <linux/list.h> +#include <trace/syscall.h> + #include <asm/cacheflush.h> #include <asm/ftrace.h> #include <asm/nops.h> @@ -440,7 +442,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) _ASM_EXTABLE(1b, 4b) _ASM_EXTABLE(2b, 4b) - : [old] "=r" (old), [faulted] "=r" (faulted) + : [old] "=&r" (old), [faulted] "=r" (faulted) : [parent] "r" (parent), [return_hooker] "r" (return_hooker) : "memory" ); |