From: Harvey Harrison Date: Wed, 30 Apr 2008 07:55:08 +0000 (-0700) Subject: kernel: replace remaining __FUNCTION__ occurrences X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=af1f16d08f38ab6f17b5760e6ec9d2b7d3a5ff1a;p=openwrt%2Fstaging%2Fblogic.git kernel: replace remaining __FUNCTION__ occurrences __FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- 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) __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 int cpu, int tasks_frozen) 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 --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) 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)) {