diff options
| author | David S. Miller <davem@davemloft.net> | 2019-11-17 03:47:31 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-17 06:51:42 +0100 |
| commit | 19b7e21c55c81713c4011278143006af9f232504 (patch) | |
| tree | e1312ccebbc23ee6b6928d1d02d644a15d695b67 /net/tipc | |
| parent | mscc.c: fix semicolon.cocci warnings (diff) | |
| parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert... (diff) | |
| download | linux-19b7e21c55c81713c4011278143006af9f232504.tar.xz linux-19b7e21c55c81713c4011278143006af9f232504.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Lots of overlapping changes and parallel additions, stuff
like that.
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 fc01a13d7462..7532a00ac73d 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 775848a5f27e..631d83c9705f 100644 --- a/net/tipc/core.h +++ b/net/tipc/core.h @@ -61,6 +61,12 @@ #include <net/genetlink.h> #include <net/netns/hash.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; |