diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2021-09-01 09:09:28 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-22 13:02:30 -0700 |
| commit | 58e2cf5d794616b84f591d4d1276c8953278ce24 (patch) | |
| tree | 8dfaf494a20ee78875b0ff1ea71c23e5003d0ae6 /init | |
| parent | 4057525736b159bd456732d11270af2cc49ec21f (diff) | |
| download | linux-stable-58e2cf5d794616b84f591d4d1276c8953278ce24.tar.gz linux-stable-58e2cf5d794616b84f591d4d1276c8953278ce24.tar.bz2 linux-stable-58e2cf5d794616b84f591d4d1276c8953278ce24.zip | |
init: Revert accidental changes to print irqs_disabled()
Commit f8ade8dddb16 ("xsurf100: drop include of lib8390.c") accidentally
changed init/main.c. Revert that part.
Fixes: f8ade8dddb16 ("xsurf100: drop include of lib8390.c")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/init/main.c b/init/main.c index 3f7216934441..81a79a77db46 100644 --- a/init/main.c +++ b/init/main.c @@ -1242,7 +1242,7 @@ trace_initcall_start_cb(void *data, initcall_t fn) { ktime_t *calltime = (ktime_t *)data; - printk(KERN_DEBUG "calling %pS @ %i irqs_disabled() %d\n", fn, task_pid_nr(current), irqs_disabled()); + printk(KERN_DEBUG "calling %pS @ %i\n", fn, task_pid_nr(current)); *calltime = ktime_get(); } @@ -1256,8 +1256,8 @@ trace_initcall_finish_cb(void *data, initcall_t fn, int ret) rettime = ktime_get(); delta = ktime_sub(rettime, *calltime); duration = (unsigned long long) ktime_to_ns(delta) >> 10; - printk(KERN_DEBUG "initcall %pS returned %d after %lld usecs, irqs_disabled() %d\n", - fn, ret, duration, irqs_disabled()); + printk(KERN_DEBUG "initcall %pS returned %d after %lld usecs\n", + fn, ret, duration); } static ktime_t initcall_calltime; |