summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-15 17:50:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-15 17:50:37 -0700
commita442ac512f36981182e66a427ad05f449ff6593b (patch)
tree8a99f2f4cb7f66e816163068c0c2c709c1852ac6 /init
parent7371fd11a6e2aed99895db4f100940fa5022f7fe (diff)
downloadop-kernel-dev-a442ac512f36981182e66a427ad05f449ff6593b.zip
op-kernel-dev-a442ac512f36981182e66a427ad05f449ff6593b.tar.gz
Clean up 'print_fn_descriptor_symbol()' types
Everybody wants to pass it a function pointer, and in fact, that is what you _must_ pass it for it to make sense (since it knows that ia64 and ppc64 use descriptors for function pointers and fetches the actual address from there). So don't make the argument be a 'unsigned long' and force everybody to add a cast. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r--init/main.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/init/main.c b/init/main.c
index f406fef..c622151 100644
--- a/init/main.c
+++ b/init/main.c
@@ -706,8 +706,7 @@ static void __init do_initcalls(void)
int result;
if (initcall_debug) {
- print_fn_descriptor_symbol("calling %s()\n",
- (unsigned long) *call);
+ print_fn_descriptor_symbol("calling %s\n", *call);
t0 = ktime_get();
}
@@ -717,8 +716,7 @@ static void __init do_initcalls(void)
t1 = ktime_get();
delta = ktime_sub(t1, t0);
- print_fn_descriptor_symbol("initcall %s()",
- (unsigned long) *call);
+ print_fn_descriptor_symbol("initcall %s", *call);
printk(" returned %d after %Ld msecs\n", result,
(unsigned long long) delta.tv64 >> 20);
}
@@ -737,8 +735,7 @@ static void __init do_initcalls(void)
local_irq_enable();
}
if (msgbuf[0]) {
- print_fn_descriptor_symbol(KERN_WARNING "initcall %s()",
- (unsigned long) *call);
+ print_fn_descriptor_symbol(KERN_WARNING "initcall %s", *call);
printk(" returned with %s\n", msgbuf);
}
}
OpenPOWER on IntegriCloud