Subject: [PATCH] ftrace: copy + paste typo in asm/ftrace.h

Signed-off-by: Sebastian Siewior <[email protected]>
---
include/asm-x86/ftrace.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/asm-x86/ftrace.h b/include/asm-x86/ftrace.h
index c184441..5c68b32 100644
--- a/include/asm-x86/ftrace.h
+++ b/include/asm-x86/ftrace.h
@@ -1,5 +1,5 @@
#ifndef _ASM_X86_FTRACE
-#define _ASM_SPARC64_FTRACE
+#define _ASM_X86_FTRACE

#ifdef CONFIG_FTRACE
#define MCOUNT_ADDR ((long)(mcount))
--
1.5.5.2


2008-07-18 11:14:49

by Ingo Molnar

[permalink] [raw]
Subject: Re: [PATCH] ftrace: copy + paste typo in asm/ftrace.h


* Sebastian Siewior <[email protected]> wrote:

> diff --git a/include/asm-x86/ftrace.h b/include/asm-x86/ftrace.h
> index c184441..5c68b32 100644
> --- a/include/asm-x86/ftrace.h
> +++ b/include/asm-x86/ftrace.h
> @@ -1,5 +1,5 @@
> #ifndef _ASM_X86_FTRACE
> -#define _ASM_SPARC64_FTRACE
> +#define _ASM_X86_FTRACE

applied to tip/x86/urgent, thanks Sebastian.

Ingo

2008-07-22 14:09:45

by Steven Rostedt

[permalink] [raw]
Subject: Re: [PATCH] ftrace: copy + paste typo in asm/ftrace.h

Sebastian Siewior wrote:
> Signed-off-by: Sebastian Siewior <[email protected]>

Acked-by: Steven Rostedt <[email protected]>

> ---
> include/asm-x86/ftrace.h | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/include/asm-x86/ftrace.h b/include/asm-x86/ftrace.h
> index c184441..5c68b32 100644
> --- a/include/asm-x86/ftrace.h
> +++ b/include/asm-x86/ftrace.h
> @@ -1,5 +1,5 @@
> #ifndef _ASM_X86_FTRACE
> -#define _ASM_SPARC64_FTRACE
> +#define _ASM_X86_FTRACE
>
> #ifdef CONFIG_FTRACE
> #define MCOUNT_ADDR ((long)(mcount))