[ forgot to add linuxppc ]
On Fri, 6 Feb 2009, Steven Rostedt wrote:
> From: Steven Rostedt <srost...@redhat.com>
>
> Michael Neuling reported a compile bug when dynamic ftrace was
> configured in and modules were not. This was due to the ftrace
> code referencing module specific structures.
>
> Reported-by: Michael Neuling <mi...@neuling.org>
> Signed-off-by: Steven Rostedt <srost...@redhat.com>
> ---
> arch/powerpc/kernel/ftrace.c | 16 +++++++++++++++-
> 1 files changed, 15 insertions(+), 1 deletions(-)
>
> diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c
> index a913f91..88c641d 100644
> --- a/arch/powerpc/kernel/ftrace.c
> +++ b/arch/powerpc/kernel/ftrace.c
> @@ -113,6 +113,8 @@ static int test_24bit_addr(unsigned long ip, unsigned
> long addr)
> return create_branch((unsigned int *)ip, addr, 0);
> }
>
> +#ifdef CONFIG_MODULES
> +
> static int is_bl_op(unsigned int op)
> {
> return (op & 0xfc000003) == 0x48000001;
> @@ -323,6 +325,7 @@ __ftrace_make_nop(struct module *mod,
> return 0;
> }
> #endif /* PPC64 */
> +#endif /* CONFIG_MODULES */
>
> int ftrace_make_nop(struct module *mod,
> struct dyn_ftrace *rec, unsigned long addr)
> @@ -342,6 +345,7 @@ int ftrace_make_nop(struct module *mod,
> return ftrace_modify_code(ip, old, new);
> }
>
> +#ifdef CONFIG_MODULES
> /*
> * Out of range jumps are called from modules.
> * We should either already have a pointer to the module
> @@ -366,9 +370,13 @@ int ftrace_make_nop(struct module *mod,
> mod = rec->arch.mod;
>
> return __ftrace_make_nop(mod, rec, addr);
> -
> +#else
> + /* We should not get here without modules */
> + return -EINVAL;
> +#endif /* CONFIG_MODULES */
> }
>
> +#ifdef CONFIG_MODULES
> #ifdef CONFIG_PPC64
> static int
> __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
> @@ -457,6 +465,7 @@ __ftrace_make_call(struct dyn_ftrace *rec, unsigned long
> addr)
> return 0;
> }
> #endif /* CONFIG_PPC64 */
> +#endif /* CONFIG_MODULES */
>
> int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
> {
> @@ -475,6 +484,7 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned
> long addr)
> return ftrace_modify_code(ip, old, new);
> }
>
> +#ifdef CONFIG_MODULES
> /*
> * Out of range jumps are called from modules.
> * Being that we are converting from nop, it had better
> @@ -486,6 +496,10 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned
> long addr)
> }
>
> return __ftrace_make_call(rec, addr);
> +#else
> + /* We should not get here without modules */
> + return -EINVAL;
> +#endif /* CONFIG_MODULES */
> }
>
> int ftrace_update_ftrace_func(ftrace_func_t func)
> --
> 1.5.6.5
>
> --
>
>
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
