diff options
Diffstat (limited to 'arch/powerpc/kernel/ftrace.c')
-rw-r--r-- | arch/powerpc/kernel/ftrace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c index 5455943f16a..70e2a736be1 100644 --- a/arch/powerpc/kernel/ftrace.c +++ b/arch/powerpc/kernel/ftrace.c | |||
@@ -293,7 +293,7 @@ __ftrace_make_nop(struct module *mod, | |||
293 | if (tramp & 0x8000) | 293 | if (tramp & 0x8000) |
294 | tramp -= 0x10000; | 294 | tramp -= 0x10000; |
295 | 295 | ||
296 | pr_debug(" %x ", tramp); | 296 | pr_debug(" %lx ", tramp); |
297 | 297 | ||
298 | if (tramp != addr) { | 298 | if (tramp != addr) { |
299 | printk(KERN_ERR | 299 | printk(KERN_ERR |
@@ -564,7 +564,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) | |||
564 | if (unlikely(atomic_read(¤t->tracing_graph_pause))) | 564 | if (unlikely(atomic_read(¤t->tracing_graph_pause))) |
565 | return; | 565 | return; |
566 | 566 | ||
567 | #if CONFIG_PPC64 | 567 | #ifdef CONFIG_PPC64 |
568 | /* non core kernel code needs to save and restore the TOC */ | 568 | /* non core kernel code needs to save and restore the TOC */ |
569 | if (REGION_ID(self_addr) != KERNEL_REGION_ID) | 569 | if (REGION_ID(self_addr) != KERNEL_REGION_ID) |
570 | return_hooker = (unsigned long)&mod_return_to_handler; | 570 | return_hooker = (unsigned long)&mod_return_to_handler; |