diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2014-06-05 01:12:16 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-05 01:54:21 +0200 |
| commit | d62cf81524304396276f6aaa5cd7ce62f6f65110 (patch) | |
| tree | 4e044b8690844396cb1b859d3900e170646ea4a8 /init | |
| parent | fs/binfmt_flat.c: make old_reloc() static (diff) | |
| download | linux-d62cf81524304396276f6aaa5cd7ce62f6f65110.tar.xz linux-d62cf81524304396276f6aaa5cd7ce62f6f65110.zip | |
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) unsigned long long duration; int ret; - pr_debug("calling %pF @ %i\n", fn, task_pid_nr(current)); + printk(KERN_DEBUG "calling %pF @ %i\n", fn, task_pid_nr(current)); calltime = ktime_get(); ret = fn(); rettime = ktime_get(); delta = ktime_sub(rettime, calltime); duration = (unsigned long long) ktime_to_ns(delta) >> 10; - pr_debug("initcall %pF returned %d after %lld usecs\n", + printk(KERN_DEBUG "initcall %pF returned %d after %lld usecs\n", fn, ret, duration); return ret; |