1 files changed, 9 insertions, 7 deletions

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 90b6ab01db59..918f386b2f6e 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2788,7 +2788,8 @@ EXPORT_SYMBOL(unregister_console);
 void __init console_init(void)
 {
         int ret;
-        initcall_t *call;
+        initcall_t call;
+        initcall_entry_t *ce;
 
         /* Setup the default TTY line discipline. */
         n_tty_init();
@@ -2797,13 +2798,14 @@ void __init console_init(void)
          * set up the console device so that later boot sequences can
          * inform about problems etc..
          */
-        call = __con_initcall_start;
+        ce = __con_initcall_start;
         trace_initcall_level("console");
-        while (call < __con_initcall_end) {
-                trace_initcall_start((*call));
-                ret = (*call)();
-                trace_initcall_finish((*call), ret);
-                call++;
+        while (ce < __con_initcall_end) {
+                call = initcall_from_entry(ce);
+                trace_initcall_start(call);
+                ret = call();
+                trace_initcall_finish(call, ret);
+                ce++;
         }
 }