From 95d3b712d619a3d34d65944e47fd7b96d2c3482c Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Wed, 30 Apr 2008 00:55:08 -0700
Subject: [PATCH] --- yaml --- r: 95296 b: refs/heads/master c:
 af1f16d08f38ab6f17b5760e6ec9d2b7d3a5ff1a h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/kernel/cpu.c       | 4 ++--
 trunk/kernel/workqueue.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2e23930bac86..023a65f33dbf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d40cee245ff6ad05d3448401d7320be82c1c5af1
+refs/heads/master: af1f16d08f38ab6f17b5760e6ec9d2b7d3a5ff1a
diff --git a/trunk/kernel/cpu.c b/trunk/kernel/cpu.c
index a98f6ab16ecd..c77bc3a1c722 100644
--- a/trunk/kernel/cpu.c
+++ b/trunk/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/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c
index 7db251a959c5..721093a22561 100644
--- a/trunk/kernel/workqueue.c
+++ b/trunk/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)) {