Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / drivers / s390 / net / qeth_l3.h

diff --git a/drivers/s390/net/qeth_l3.h b/drivers/s390/net/qeth_l3.h
index f639cc3af22b547a7b00abc7879864927c1beecf..1be353593a59f5a4caa47ab2a1f13f048abeb59d 100644 (file)
--- a/drivers/s390/net/qeth_l3.h
+++ b/drivers/s390/net/qeth_l3.h
@@ -13,16 +13,7 @@
 
 #include "qeth_core.h"
 
-#define QETH_DBF_TEXT_(name, level, text...) \
-       do { \
-               if (qeth_dbf_passes(qeth_dbf_##name, level)) { \
-                       char *dbf_txt_buf = get_cpu_var(qeth_l3_dbf_txt_buf); \
-                       sprintf(dbf_txt_buf, text); \
-                       debug_text_event(qeth_dbf_##name, level, dbf_txt_buf); \
-                       put_cpu_var(qeth_l3_dbf_txt_buf); \
-               } \
-       } while (0)
-
+#define QETH_DBF_TXT_BUF qeth_l3_dbf_txt_buf
 DECLARE_PER_CPU(char[256], qeth_l3_dbf_txt_buf);
 
 struct qeth_ipaddr {