diff options
| author | Matt Bennett <matt.bennett@alliedtelesis.co.nz> | 2019-11-14 00:20:03 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-15 03:03:03 +0100 |
| commit | d7f9f47d4d1243cf960725a755123cfae13a3e51 (patch) | |
| tree | 032b7229f010d89550b195494b4760b5536f7b8b /net/tipc | |
| parent | Merge tag 'linux-can-fixes-for-5.4-20191114' of git://git.kernel.org/pub/scm/... (diff) | |
| download | linux-d7f9f47d4d1243cf960725a755123cfae13a3e51.tar.xz linux-d7f9f47d4d1243cf960725a755123cfae13a3e51.zip | |
tipc: add back tipc prefix to log messages
The tipc prefix for log messages generated by tipc was
removed in commit 07f6c4bc048a ("tipc: convert tipc reference
table to use generic rhashtable").
This is still a useful prefix so add it back.
Signed-off-by: Matt Bennett <matt.bennett@alliedtelesis.co.nz>
Acked-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/core.c | 2 | ||||
| -rw-r--r-- | net/tipc/core.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c index 23cb379a93d6..8f35060a24e1 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c @@ -34,8 +34,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - #include "core.h" #include "name_table.h" #include "subscr.h" diff --git a/net/tipc/core.h b/net/tipc/core.h index 60d829581068..3042f654e0af 100644 --- a/net/tipc/core.h +++ b/net/tipc/core.h @@ -60,6 +60,12 @@ #include <linux/rhashtable.h> #include <net/genetlink.h> +#ifdef pr_fmt +#undef pr_fmt +#endif + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + struct tipc_node; struct tipc_bearer; struct tipc_bc_base; |