From 06f56fd2ed25446a06fdc90ebb37672757da228a Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Mon, 3 Mar 2008 11:42:17 -0800 Subject: [PATCH] --- yaml --- r: 86895 b: refs/heads/master c: 9a4a668240e2f9564d12347c50c3d9c5f1686a85 h: refs/heads/master i: 86893: 38ef8fe7f56f10ab69d62249e64b8d61215f3018 86891: 59e797950e0f7345f3f0835ac0fab30fea7c1d0f 86887: 88599391f2feca487e6913b720b2a16cb49da936 86879: d60e4d75f0cf222d8ac89081a0b38ff51e7f7b96 v: v3 --- [refs] | 2 +- trunk/arch/sparc64/solaris/conv.h | 2 +- trunk/arch/sparc64/solaris/timod.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2f80a9276caf..fe09ee88414a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74074dec4f365e1b042ad47f75854f06bd771455 +refs/heads/master: 9a4a668240e2f9564d12347c50c3d9c5f1686a85 diff --git a/trunk/arch/sparc64/solaris/conv.h b/trunk/arch/sparc64/solaris/conv.h index 5faf59a9de39..50e58232cf2b 100644 --- a/trunk/arch/sparc64/solaris/conv.h +++ b/trunk/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/trunk/arch/sparc64/solaris/timod.c b/trunk/arch/sparc64/solaris/timod.c index f53123c02c2b..15234fcd191a 100644 --- a/trunk/arch/sparc64/solaris/timod.c +++ b/trunk/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)