Signed-off-by: Robert Richter <[EMAIL PROTECTED]>
---
arch/powerpc/perfmon/perfmon_cell.c | 2 +-
include/linux/perfmon_kern.h | 4 ++--
perfmon/perfmon_msg.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/perfmon/perfmon_cell.c
b/arch/powerpc/perfmon/perfmon_cell.c
index 0c4201f..7d03236 100644
--- a/arch/powerpc/perfmon/perfmon_cell.c
+++ b/arch/powerpc/perfmon/perfmon_cell.c
@@ -612,7 +612,7 @@ static void write_pm07_event(int cpu, unsigned int ctr, u64
value)
rc = activate_signals(&signal, 1);
if (rc) {
PFM_WARN("%s(%d, %u, %lu): Error calling "
- "activate_signals(): %d\n", __FUNCTION__,
+ "activate_signals(): %d\n", __func__,
cpu, ctr, (unsigned long)value, rc);
/* FIX: Could we change this routine to return an error? */
}
diff --git a/include/linux/perfmon_kern.h b/include/linux/perfmon_kern.h
index 1300c0c..57ee341 100644
--- a/include/linux/perfmon_kern.h
+++ b/include/linux/perfmon_kern.h
@@ -233,7 +233,7 @@ struct pfm_context {
do { \
if (unlikely(pfm_controls.debug > 0 && printk_ratelimit())) { \
printk("perfmon: %s.%d: CPU%d [%d]: " f "\n", \
- __FUNCTION__, __LINE__, \
+ __func__, __LINE__, \
smp_processor_id(), current->pid , ## x); \
} \
} while (0)
@@ -243,7 +243,7 @@ struct pfm_context {
if (unlikely(pfm_controls.debug_ovfl >0 \
&& printk_ratelimit())) { \
printk("perfmon: %s.%d: CPU%d [%d]: " f "\n", \
- __FUNCTION__, __LINE__, \
+ __func__, __LINE__, \
smp_processor_id(), current->pid , ## x); \
} \
} while (0)
diff --git a/perfmon/perfmon_msg.c b/perfmon/perfmon_msg.c
index e95fd11..978f8f6 100644
--- a/perfmon/perfmon_msg.c
+++ b/perfmon/perfmon_msg.c
@@ -175,7 +175,7 @@ int pfm_end_notify(struct pfm_context *ctx)
msg = pfm_get_new_msg(ctx);
if (msg == NULL) {
- PFM_ERR("%s no more msgs", __FUNCTION__);
+ PFM_ERR("%s no more msgs", __func__);
return -1;
}
/* no leak */
--
1.5.3.7
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
perfmon2-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/perfmon2-devel
