diff options
-rw-r--r-- | kernel/cpu.c | 4 | ||||
-rw-r--r-- | kernel/workqueue.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index a98f6ab16ecd..c77bc3a1c722 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c | |||
@@ -215,7 +215,7 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen) | |||
215 | __raw_notifier_call_chain(&cpu_chain, CPU_DOWN_FAILED | mod, | 215 | __raw_notifier_call_chain(&cpu_chain, CPU_DOWN_FAILED | mod, |
216 | hcpu, nr_calls, NULL); | 216 | hcpu, nr_calls, NULL); |
217 | printk("%s: attempt to take down CPU %u failed\n", | 217 | printk("%s: attempt to take down CPU %u failed\n", |
218 | __FUNCTION__, cpu); | 218 | __func__, cpu); |
219 | err = -EINVAL; | 219 | err = -EINVAL; |
220 | goto out_release; | 220 | goto out_release; |
221 | } | 221 | } |
@@ -295,7 +295,7 @@ static int __cpuinit _cpu_up(unsigned int cpu, int tasks_frozen) | |||
295 | if (ret == NOTIFY_BAD) { | 295 | if (ret == NOTIFY_BAD) { |
296 | nr_calls--; | 296 | nr_calls--; |
297 | printk("%s: attempt to bring up CPU %u failed\n", | 297 | printk("%s: attempt to bring up CPU %u failed\n", |
298 | __FUNCTION__, cpu); | 298 | __func__, cpu); |
299 | ret = -EINVAL; | 299 | ret = -EINVAL; |
300 | goto out_notify; | 300 | goto out_notify; |
301 | } | 301 | } |
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 7db251a959c5..721093a22561 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c | |||
@@ -247,7 +247,7 @@ static void run_workqueue(struct cpu_workqueue_struct *cwq) | |||
247 | if (cwq->run_depth > 3) { | 247 | if (cwq->run_depth > 3) { |
248 | /* morton gets to eat his hat */ | 248 | /* morton gets to eat his hat */ |
249 | printk("%s: recursion depth exceeded: %d\n", | 249 | printk("%s: recursion depth exceeded: %d\n", |
250 | __FUNCTION__, cwq->run_depth); | 250 | __func__, cwq->run_depth); |
251 | dump_stack(); | 251 | dump_stack(); |
252 | } | 252 | } |
253 | while (!list_empty(&cwq->worklist)) { | 253 | while (!list_empty(&cwq->worklist)) { |