From: Mike Christie <michaelc@xxxxxxxxxxx> When using ceph from other modules like the target ones, pr_fmt might already be defined. This just ifndefs it. Signed-off-by: Mike Christie <michaelc@xxxxxxxxxxx> --- include/linux/ceph/ceph_debug.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/linux/ceph/ceph_debug.h b/include/linux/ceph/ceph_debug.h index aa2e191..05711eb 100644 --- a/include/linux/ceph/ceph_debug.h +++ b/include/linux/ceph/ceph_debug.h @@ -1,7 +1,9 @@ #ifndef _FS_CEPH_DEBUG_H #define _FS_CEPH_DEBUG_H +#ifndef pr_fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#endif #ifdef CONFIG_CEPH_LIB_PRETTYDEBUG -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe target-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
