Commit 58e2cf5d authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

init: Revert accidental changes to print irqs_disabled() 



Commit f8ade8dd ("xsurf100: drop include of lib8390.c") accidentally
changed init/main.c.  Revert that part.

Fixes: f8ade8dd ("xsurf100: drop include of lib8390.c")
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 40575257

init/main.c

+3 −3
Original line number Diff line number Diff line
@@ -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;