diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2014-06-04 19:12:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 19:54:21 -0400 |
commit | d62cf81524304396276f6aaa5cd7ce62f6f65110 (patch) | |
tree | 4e044b8690844396cb1b859d3900e170646ea4a8 /init | |
parent | 343034357202be37be335a08ef4a0f0708b6ba3d (diff) |
init/main.c: don't use pr_debug()
Pertially revert commit ea676e846a81 ("init/main.c: convert to
pr_foo()").
Unbeknownst to me, pr_debug() is different from the other pr_foo()
levels: pr_debug() is a no-op when DEBUG is not defined.
Happily, init/main.c does have a #define DEBUG so we didn't break
initcall_debug. But the functioning of initcall_debug should not be
dependent upon the presence of that #define DEBUG.
Reported-by: Russell King <rmk@arm.linux.org.uk>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r-- | init/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c index 04fab8d74c89..9d3a7b84de5c 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -671,13 +671,13 @@ static int __init_or_module do_one_initcall_debug(initcall_t fn) | |||
671 | unsigned long long duration; | 671 | unsigned long long duration; |
672 | int ret; | 672 | int ret; |
673 | 673 | ||
674 | pr_debug("calling %pF @ %i\n", fn, task_pid_nr(current)); | 674 | printk(KERN_DEBUG "calling %pF @ %i\n", fn, task_pid_nr(current)); |
675 | calltime = ktime_get(); | 675 | calltime = ktime_get(); |
676 | ret = fn(); | 676 | ret = fn(); |
677 | rettime = ktime_get(); | 677 | rettime = ktime_get(); |
678 | delta = ktime_sub(rettime, calltime); | 678 | delta = ktime_sub(rettime, calltime); |
679 | duration = (unsigned long long) ktime_to_ns(delta) >> 10; | 679 | duration = (unsigned long long) ktime_to_ns(delta) >> 10; |
680 | pr_debug("initcall %pF returned %d after %lld usecs\n", | 680 | printk(KERN_DEBUG "initcall %pF returned %d after %lld usecs\n", |
681 | fn, ret, duration); | 681 | fn, ret, duration); |
682 | 682 | ||
683 | return ret; | 683 | return ret; |