diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-05-19 01:09:05 -0400 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-05-19 01:09:05 -0400 |
| commit | c203e45f069af47ca7623e4dcd8c00bfba2722e4 (patch) | |
| tree | 4563115b6565dcfd97015c1c9366fb3d07cabf19 /fs/smbfs | |
| parent | a94477da38e0b261a7ecea71f4c95a3bcd5be69c (diff) | |
| parent | b8291ad07a7f3b5b990900f0001198ac23ba893e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'fs/smbfs')
| -rw-r--r-- | fs/smbfs/smb_debug.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/smbfs/smb_debug.h b/fs/smbfs/smb_debug.h index 734972b92694..fc4b1a5dd755 100644 --- a/fs/smbfs/smb_debug.h +++ b/fs/smbfs/smb_debug.h | |||
| @@ -11,14 +11,14 @@ | |||
| 11 | * these are normally enabled. | 11 | * these are normally enabled. |
| 12 | */ | 12 | */ |
| 13 | #ifdef SMBFS_PARANOIA | 13 | #ifdef SMBFS_PARANOIA |
| 14 | # define PARANOIA(f, a...) printk(KERN_NOTICE "%s: " f, __FUNCTION__ , ## a) | 14 | # define PARANOIA(f, a...) printk(KERN_NOTICE "%s: " f, __func__ , ## a) |
| 15 | #else | 15 | #else |
| 16 | # define PARANOIA(f, a...) do { ; } while(0) | 16 | # define PARANOIA(f, a...) do { ; } while(0) |
| 17 | #endif | 17 | #endif |
| 18 | 18 | ||
| 19 | /* lots of debug messages */ | 19 | /* lots of debug messages */ |
| 20 | #ifdef SMBFS_DEBUG_VERBOSE | 20 | #ifdef SMBFS_DEBUG_VERBOSE |
| 21 | # define VERBOSE(f, a...) printk(KERN_DEBUG "%s: " f, __FUNCTION__ , ## a) | 21 | # define VERBOSE(f, a...) printk(KERN_DEBUG "%s: " f, __func__ , ## a) |
| 22 | #else | 22 | #else |
| 23 | # define VERBOSE(f, a...) do { ; } while(0) | 23 | # define VERBOSE(f, a...) do { ; } while(0) |
| 24 | #endif | 24 | #endif |
| @@ -28,7 +28,7 @@ | |||
| 28 | * too common name. | 28 | * too common name. |
| 29 | */ | 29 | */ |
| 30 | #ifdef SMBFS_DEBUG | 30 | #ifdef SMBFS_DEBUG |
| 31 | #define DEBUG1(f, a...) printk(KERN_DEBUG "%s: " f, __FUNCTION__ , ## a) | 31 | #define DEBUG1(f, a...) printk(KERN_DEBUG "%s: " f, __func__ , ## a) |
| 32 | #else | 32 | #else |
| 33 | #define DEBUG1(f, a...) do { ; } while(0) | 33 | #define DEBUG1(f, a...) do { ; } while(0) |
| 34 | #endif | 34 | #endif |