* [PATCH] sparc64: replace remaining __FUNCTION__ occurances
@ 2008-03-03 19:28 Harvey Harrison
2008-03-03 19:42 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Harvey Harrison @ 2008-03-03 19:28 UTC (permalink / raw)
To: David Miller; +Cc: Andrew Morton, LKML
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
arch/sparc64/solaris/conv.h | 2 +-
arch/sparc64/solaris/timod.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/sparc64/solaris/conv.h b/arch/sparc64/solaris/conv.h
index 5faf59a..50e5823 100644
--- a/arch/sparc64/solaris/conv.h
+++ b/arch/sparc64/solaris/conv.h
@@ -28,7 +28,7 @@ extern unsigned sunos_sys_table[];
#define SUNOS(x) ((long)sunos_sys_table[x])
#ifdef DEBUG_SOLARIS
-#define SOLD(s) printk("%s,%d,%s(): %s\n",__FILE__,__LINE__,__FUNCTION__,(s))
+#define SOLD(s) printk("%s,%d,%s(): %s\n",__FILE__,__LINE__,__func__,(s))
#define SOLDD(s) printk("solaris: "); printk s
#else
#define SOLD(s)
diff --git a/arch/sparc64/solaris/timod.c b/arch/sparc64/solaris/timod.c
index f53123c..15234fc 100644
--- a/arch/sparc64/solaris/timod.c
+++ b/arch/sparc64/solaris/timod.c
@@ -81,7 +81,7 @@ void mykfree(void *p)
#define MKCTL_MAGIC 0xDEADBABEBADC0DEDL
#define PUT_MAGIC(a,m) do{(*(u64*)(a))=(m);}while(0)
#define SCHECK_MAGIC(a,m) do{if((*(u64*)(a))!=(m))printk("%s,%u,%s(): magic %08x at %p corrupted!\n",\
- __FILE__,__LINE__,__FUNCTION__,(m),(a));}while(0)
+ __FILE__,__LINE__,__func__,(m),(a));}while(0)
#define BUF_OFFSET sizeof(u64)
#define MKCTL_TRAILER sizeof(u64)
--
1.5.4.3.500.g83a2c
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] sparc64: replace remaining __FUNCTION__ occurances
2008-03-03 19:28 [PATCH] sparc64: replace remaining __FUNCTION__ occurances Harvey Harrison
@ 2008-03-03 19:42 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2008-03-03 19:42 UTC (permalink / raw)
To: harvey.harrison; +Cc: akpm, linux-kernel
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Mon, 03 Mar 2008 11:28:01 -0800
> __FUNCTION__ is gcc-specific, use __func__
>
> Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-03-03 19:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-03-03 19:28 [PATCH] sparc64: replace remaining __FUNCTION__ occurances Harvey Harrison
2008-03-03 19:42 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®