Skip to content

Commit 58e2cf5

Browse files
geertutorvalds
authored andcommitted
init: Revert accidental changes to print irqs_disabled()
Commit f8ade8d ("xsurf100: drop include of lib8390.c") accidentally changed init/main.c. Revert that part. Fixes: f8ade8d ("xsurf100: drop include of lib8390.c") Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 4057525 commit 58e2cf5

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

init/main.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,7 +1242,7 @@ trace_initcall_start_cb(void *data, initcall_t fn)
12421242
{
12431243
ktime_t *calltime = (ktime_t *)data;
12441244

1245-
printk(KERN_DEBUG "calling %pS @ %i irqs_disabled() %d\n", fn, task_pid_nr(current), irqs_disabled());
1245+
printk(KERN_DEBUG "calling %pS @ %i\n", fn, task_pid_nr(current));
12461246
*calltime = ktime_get();
12471247
}
12481248

@@ -1256,8 +1256,8 @@ trace_initcall_finish_cb(void *data, initcall_t fn, int ret)
12561256
rettime = ktime_get();
12571257
delta = ktime_sub(rettime, *calltime);
12581258
duration = (unsigned long long) ktime_to_ns(delta) >> 10;
1259-
printk(KERN_DEBUG "initcall %pS returned %d after %lld usecs, irqs_disabled() %d\n",
1260-
fn, ret, duration, irqs_disabled());
1259+
printk(KERN_DEBUG "initcall %pS returned %d after %lld usecs\n",
1260+
fn, ret, duration);
12611261
}
12621262

12631263
static ktime_t initcall_calltime;

0 commit comments

Comments
 (0)