From: Harvey Harrison __FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison Signed-off-by: Andrew Morton --- kernel/cpu.c | 4 ++-- kernel/workqueue.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff -puN kernel/cpu.c~kernel-replace-remaining-__function__-occurances kernel/cpu.c --- a/kernel/cpu.c~kernel-replace-remaining-__function__-occurances +++ a/kernel/cpu.c @@ -215,7 +215,7 @@ static int __ref _cpu_down(unsigned int __raw_notifier_call_chain(&cpu_chain, CPU_DOWN_FAILED | mod, hcpu, nr_calls, NULL); printk("%s: attempt to take down CPU %u failed\n", - __FUNCTION__, cpu); + __func__, cpu); err = -EINVAL; goto out_release; } @@ -295,7 +295,7 @@ static int __cpuinit _cpu_up(unsigned in if (ret == NOTIFY_BAD) { nr_calls--; printk("%s: attempt to bring up CPU %u failed\n", - __FUNCTION__, cpu); + __func__, cpu); ret = -EINVAL; goto out_notify; } diff -puN kernel/workqueue.c~kernel-replace-remaining-__function__-occurances kernel/workqueue.c --- a/kernel/workqueue.c~kernel-replace-remaining-__function__-occurances +++ a/kernel/workqueue.c @@ -247,7 +247,7 @@ static void run_workqueue(struct cpu_wor if (cwq->run_depth > 3) { /* morton gets to eat his hat */ printk("%s: recursion depth exceeded: %d\n", - __FUNCTION__, cwq->run_depth); + __func__, cwq->run_depth); dump_stack(); } while (!list_empty(&cwq->worklist)) { _