aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/oprofile
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-04-22 21:39:01 -0400
committerBryan Wu <cooloney@kernel.org>2008-04-22 21:39:01 -0400
commitb85d858b40a28107ee50ca9e89f57c0e35c251c6 (patch)
tree96f1a2a344529e820fb0f256331070be3d83e600 /arch/blackfin/oprofile
parent6b13483ba2c9c90fc34c79b44be418b56b6a756c (diff)
[Blackfin] arch: __FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Cc: Mike Frysinger <vapier.adi@gmail.com> Signed-off-by: Bryan Wu <cooloney@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin/oprofile')
-rw-r--r--arch/blackfin/oprofile/common.c2
-rw-r--r--arch/blackfin/oprofile/op_model_bf533.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/oprofile/common.c b/arch/blackfin/oprofile/common.c
index cb8b8d5af34f..0f6d303a8891 100644
--- a/arch/blackfin/oprofile/common.c
+++ b/arch/blackfin/oprofile/common.c
@@ -75,7 +75,7 @@ static int op_bfin_start(void)
75{ 75{
76 int ret = -EBUSY; 76 int ret = -EBUSY;
77 77
78 printk(KERN_INFO "KSDBG:in %s\n", __FUNCTION__); 78 printk(KERN_INFO "KSDBG:in %s\n", __func__);
79 mutex_lock(&pfmon_lock); 79 mutex_lock(&pfmon_lock);
80 if (!pfmon_enabled) { 80 if (!pfmon_enabled) {
81 ret = model->start(ctr); 81 ret = model->start(ctr);
diff --git a/arch/blackfin/oprofile/op_model_bf533.c b/arch/blackfin/oprofile/op_model_bf533.c
index 872dffe33623..d1c698bb9ee5 100644
--- a/arch/blackfin/oprofile/op_model_bf533.c
+++ b/arch/blackfin/oprofile/op_model_bf533.c
@@ -125,7 +125,7 @@ int pm_overflow_handler(int irq, struct pt_regs *regs)
125 unsigned int pc, pfctl; 125 unsigned int pc, pfctl;
126 unsigned int count[2]; 126 unsigned int count[2];
127 127
128 pr_debug("get interrupt in %s\n", __FUNCTION__); 128 pr_debug("get interrupt in %s\n", __func__);
129 if (oprofile_running == 0) { 129 if (oprofile_running == 0) {
130 pr_debug("error: entering interrupt when oprofile is stopped.\n\r"); 130 pr_debug("error: entering interrupt when oprofile is stopped.\n\r");
131 return -1; 131 return -1;