summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2006-06-25 23:40:35 -0700
committerDavid S. Miller <davem@davemloft.net>2006-06-25 23:40:35 -0700
commita4e0927902508a5f7f04be56d3c3e1b174481705 (patch)
tree5ee3be5ca4697b03d6acfe6233b5d2464311066d
parentd356eeba8e34786621d85468e5176052813a3059 (diff)
downloadlinux-3.10-a4e0927902508a5f7f04be56d3c3e1b174481705.tar.gz
linux-3.10-a4e0927902508a5f7f04be56d3c3e1b174481705.tar.bz2
linux-3.10-a4e0927902508a5f7f04be56d3c3e1b174481705.zip
[TIPC]: Allow compilation when CONFIG_TIPC_DEBUG is not set.
Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: Per Liden <per.liden@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/tipc/core.h19
1 files changed, 14 insertions, 5 deletions
diff --git a/net/tipc/core.h b/net/tipc/core.h
index 1f2e8b27a13..d1edb7af550 100644
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -2,7 +2,7 @@
* net/tipc/core.h: Include file for TIPC global declarations
*
* Copyright (c) 2005-2006, Ericsson AB
- * Copyright (c) 2005, Wind River Systems
+ * Copyright (c) 2005-2006, Wind River Systems
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -111,10 +111,6 @@ void tipc_dump(struct print_buf*,const char *fmt, ...);
#else
-#ifndef DBG_OUTPUT
-#define DBG_OUTPUT NULL
-#endif
-
/*
* TIPC debug support not included:
* - system messages are printed to system console
@@ -129,6 +125,19 @@ void tipc_dump(struct print_buf*,const char *fmt, ...);
#define msg_dbg(msg,txt) do {} while (0)
#define dump(fmt,arg...) do {} while (0)
+
+/*
+ * TIPC_OUTPUT is defined to be the system console, while DBG_OUTPUT is
+ * the null print buffer. Thes ensures that any system or debug messages
+ * that are generated without using the above macros are handled correctly.
+ */
+
+#undef TIPC_OUTPUT
+#define TIPC_OUTPUT TIPC_CONS
+
+#undef DBG_OUTPUT
+#define DBG_OUTPUT NULL
+
#endif