diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-06-06 17:37:29 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 19:08:13 -0400 |
commit | aba871f1e9a8dad07d442913998cd679529f2784 (patch) | |
tree | 3bf5c2766bc167920fa5367e6f8b5f377bfa79f0 /kernel | |
parent | 9606d9aa858aeb70f3b6062bab82eb1e5a91a923 (diff) |
kernel/profile.c: convert printk to pr_foo()
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/profile.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/kernel/profile.c b/kernel/profile.c index cb980f0c731b..c1204e2af5b2 100644 --- a/kernel/profile.c +++ b/kernel/profile.c | |||
@@ -64,12 +64,10 @@ int profile_setup(char *str) | |||
64 | str += strlen(sleepstr) + 1; | 64 | str += strlen(sleepstr) + 1; |
65 | if (get_option(&str, &par)) | 65 | if (get_option(&str, &par)) |
66 | prof_shift = par; | 66 | prof_shift = par; |
67 | printk(KERN_INFO | 67 | pr_info("kernel sleep profiling enabled (shift: %ld)\n", |
68 | "kernel sleep profiling enabled (shift: %ld)\n", | ||
69 | prof_shift); | 68 | prof_shift); |
70 | #else | 69 | #else |
71 | printk(KERN_WARNING | 70 | pr_warn("kernel sleep profiling requires CONFIG_SCHEDSTATS\n"); |
72 | "kernel sleep profiling requires CONFIG_SCHEDSTATS\n"); | ||
73 | #endif /* CONFIG_SCHEDSTATS */ | 71 | #endif /* CONFIG_SCHEDSTATS */ |
74 | } else if (!strncmp(str, schedstr, strlen(schedstr))) { | 72 | } else if (!strncmp(str, schedstr, strlen(schedstr))) { |
75 | prof_on = SCHED_PROFILING; | 73 | prof_on = SCHED_PROFILING; |
@@ -77,8 +75,7 @@ int profile_setup(char *str) | |||
77 | str += strlen(schedstr) + 1; | 75 | str += strlen(schedstr) + 1; |
78 | if (get_option(&str, &par)) | 76 | if (get_option(&str, &par)) |
79 | prof_shift = par; | 77 | prof_shift = par; |
80 | printk(KERN_INFO | 78 | pr_info("kernel schedule profiling enabled (shift: %ld)\n", |
81 | "kernel schedule profiling enabled (shift: %ld)\n", | ||
82 | prof_shift); | 79 | prof_shift); |
83 | } else if (!strncmp(str, kvmstr, strlen(kvmstr))) { | 80 | } else if (!strncmp(str, kvmstr, strlen(kvmstr))) { |
84 | prof_on = KVM_PROFILING; | 81 | prof_on = KVM_PROFILING; |
@@ -86,13 +83,12 @@ int profile_setup(char *str) | |||
86 | str += strlen(kvmstr) + 1; | 83 | str += strlen(kvmstr) + 1; |
87 | if (get_option(&str, &par)) | 84 | if (get_option(&str, &par)) |
88 | prof_shift = par; | 85 | prof_shift = par; |
89 | printk(KERN_INFO | 86 | pr_info("kernel KVM profiling enabled (shift: %ld)\n", |
90 | "kernel KVM profiling enabled (shift: %ld)\n", | ||
91 | prof_shift); | 87 | prof_shift); |
92 | } else if (get_option(&str, &par)) { | 88 | } else if (get_option(&str, &par)) { |
93 | prof_shift = par; | 89 | prof_shift = par; |
94 | prof_on = CPU_PROFILING; | 90 | prof_on = CPU_PROFILING; |
95 | printk(KERN_INFO "kernel profiling enabled (shift: %ld)\n", | 91 | pr_info("kernel profiling enabled (shift: %ld)\n", |
96 | prof_shift); | 92 | prof_shift); |
97 | } | 93 | } |
98 | return 1; | 94 | return 1; |