Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck...

[cascardo/linux.git] / fs / ufs / ufs.h

diff --git a/fs/ufs/ufs.h b/fs/ufs/ufs.h
index 343e6fc..2a07396 100644 (file)
--- a/fs/ufs/ufs.h
+++ b/fs/ufs/ufs.h
@@ -1,6 +1,12 @@
 #ifndef _UFS_UFS_H
 #define _UFS_UFS_H 1
 
+#ifdef pr_fmt
+#undef pr_fmt
+#endif
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #define UFS_MAX_GROUP_LOADED 8
 #define UFS_CGNO_EMPTY ((unsigned)-1)
 
@@ -71,9 +77,9 @@ struct ufs_inode_info {
  */
 #ifdef CONFIG_UFS_DEBUG
 #      define UFSD(f, a...)    {                                       \
-               printk ("UFSD (%s, %d): %s:",                           \
+               pr_debug("UFSD (%s, %d): %s:",                          \
                        __FILE__, __LINE__, __func__);          \
-               printk (f, ## a);                                       \
+               pr_debug(f, ## a);                                      \
        }
 #else
 #      define UFSD(f, a...)    /**/