diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-11 15:34:05 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 15:34:05 +0100 |
commit | d19b85db9d5c44a4c21dcb10d6fbadaa4425ab2a (patch) | |
tree | 250be7a5a29069f7d1f4524fa45ab0e988833025 /drivers/staging/otus/oal_marc.h | |
parent | 490dea45d00f01847ebebd007685d564aaf2cd98 (diff) | |
parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) |
Merge commit 'v2.6.29-rc1' into timers/urgent
Diffstat (limited to 'drivers/staging/otus/oal_marc.h')
-rw-r--r-- | drivers/staging/otus/oal_marc.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/otus/oal_marc.h b/drivers/staging/otus/oal_marc.h index 438e4bc2e9a..206111616a0 100644 --- a/drivers/staging/otus/oal_marc.h +++ b/drivers/staging/otus/oal_marc.h @@ -106,14 +106,14 @@ /***** Debug message *****/ #if 0 -#define zm_debug_msg0(msg) printk("%s:%s\n", __FUNCTION__, msg); -#define zm_debug_msg1(msg, val) printk("%s:%s%ld\n", __FUNCTION__, \ +#define zm_debug_msg0(msg) printk("%s:%s\n", __func__, msg); +#define zm_debug_msg1(msg, val) printk("%s:%s%ld\n", __func__, \ msg, (u32_t)val); -#define zm_debug_msg2(msg, val) printk("%s:%s%lxh\n", __FUNCTION__, \ +#define zm_debug_msg2(msg, val) printk("%s:%s%lxh\n", __func__, \ msg, (u32_t)val); -#define zm_debug_msg_s(msg, val) printk("%s:%s%s\n", __FUNCTION__, \ +#define zm_debug_msg_s(msg, val) printk("%s:%s%s\n", __func__, \ msg, val); -#define zm_debug_msg_p(msg, val1, val2) printk("%s:%s%01ld.%02ld\n", __FUNCTION__, \ +#define zm_debug_msg_p(msg, val1, val2) printk("%s:%s%01ld.%02ld\n", __func__, \ msg, (val1/val2), (((val1*100)/val2)%100)); #define zm_dbg(S) printk S #else @@ -127,7 +127,7 @@ #define zm_assert(expr) if(!(expr)) { \ printk( "Atheors Assertion failed! %s,%s,%s,line=%d\n", \ - #expr,__FILE__,__FUNCTION__,__LINE__); \ + #expr,__FILE__,__func__,__LINE__); \ } #define DbgPrint printk |