Skip to contentSkip to conversation

sparc64: replace remaining __FUNCTION__ occurances

PATCH Applied Harvey Harrison 2 participants 2 messages Mar 3, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sparc64: replace remaining __FUNCTION__ occurances

__FUNCTION__ is gcc-specific, use __func__

---
 arch/sparc64/solaris/conv.h  |    2 +-
 arch/sparc64/solaris/timod.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/sparc64/solaris/conv.h +1 -1
index 5faf59a..50e5823 100644
@@ -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)
arch/sparc64/solaris/timod.c +1 -1
index f53123c..15234fc 100644
@@ -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)
 
Signature · 1 line
1.5.4.3.500.g83a2c