Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af1f16d0 authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

kernel: replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d40cee24

kernel/cpu.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

kernel/workqueue.c

+1 −1
Original line number Diff line number Diff line
@@ -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)) {