From cdcaff6fea3b444a83be3440a6176952d54136c1 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Mon, 6 Apr 2009 04:40:46 +0000 Subject: [PATCH] --- yaml --- r: 142531 b: refs/heads/master c: 7ddb7ad11f862f46d6d55d629a6fb45a5f4cb030 h: refs/heads/master i: 142529: 31d534aa19190a643a930fac4c038143d344a35e 142527: 33734e49fa821649b15d3c615c6a6061d3805e68 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/ftrace.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d1fea4da8a02..85b25f448608 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4952f6cbeb025bc90906b740dc495f4817266d6 +refs/heads/master: 7ddb7ad11f862f46d6d55d629a6fb45a5f4cb030 diff --git a/trunk/arch/powerpc/kernel/ftrace.c b/trunk/arch/powerpc/kernel/ftrace.c index c2b90a941f77..70e2a736be1f 100644 --- a/trunk/arch/powerpc/kernel/ftrace.c +++ b/trunk/arch/powerpc/kernel/ftrace.c @@ -293,7 +293,7 @@ __ftrace_make_nop(struct module *mod, if (tramp & 0x8000) tramp -= 0x10000; - pr_debug(" %x ", tramp); + pr_debug(" %lx ", tramp); if (tramp != addr) { printk(KERN_ERR