aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-15 20:50:37 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-15 20:50:37 -0400
commita442ac512f36981182e66a427ad05f449ff6593b (patch)
tree8a99f2f4cb7f66e816163068c0c2c709c1852ac6 /init/main.c
parent7371fd11a6e2aed99895db4f100940fa5022f7fe (diff)
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/main.c')
-rw-r--r--init/main.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/init/main.c b/init/main.c
index f406fefa626c..c62215146a80 100644
--- a/init/main.c
+++ b/init/main.c
@@ -706,8 +706,7 @@ static void __init do_initcalls(void)
706 int result; 706 int result;
707 707
708 if (initcall_debug) { 708 if (initcall_debug) {
709 print_fn_descriptor_symbol("calling %s()\n", 709 print_fn_descriptor_symbol("calling %s\n", *call);
710 (unsigned long) *call);
711 t0 = ktime_get(); 710 t0 = ktime_get();
712 } 711 }
713 712
@@ -717,8 +716,7 @@ static void __init do_initcalls(void)
717 t1 = ktime_get(); 716 t1 = ktime_get();
718 delta = ktime_sub(t1, t0); 717 delta = ktime_sub(t1, t0);
719 718
720 print_fn_descriptor_symbol("initcall %s()", 719 print_fn_descriptor_symbol("initcall %s", *call);
721 (unsigned long) *call);
722 printk(" returned %d after %Ld msecs\n", result, 720 printk(" returned %d after %Ld msecs\n", result,
723 (unsigned long long) delta.tv64 >> 20); 721 (unsigned long long) delta.tv64 >> 20);
724 } 722 }
@@ -737,8 +735,7 @@ static void __init do_initcalls(void)
737 local_irq_enable(); 735 local_irq_enable();
738 } 736 }
739 if (msgbuf[0]) { 737 if (msgbuf[0]) {
740 print_fn_descriptor_symbol(KERN_WARNING "initcall %s()", 738 print_fn_descriptor_symbol(KERN_WARNING "initcall %s", *call);
741 (unsigned long) *call);
742 printk(" returned with %s\n", msgbuf); 739 printk(" returned with %s\n", msgbuf);
743 } 740 }
744 } 741 }