Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / s390 / cio / cio_debug.h

diff --git a/drivers/s390/cio/cio_debug.h b/drivers/s390/cio/cio_debug.h
index 6af8b27..f88844a 100644 (file)
--- a/drivers/s390/cio/cio_debug.h
+++ b/drivers/s390/cio/cio_debug.h
@@ -3,6 +3,11 @@
 
 #include <asm/debug.h>
 
+/* for use of debug feature */
+extern debug_info_t *cio_debug_msg_id;
+extern debug_info_t *cio_debug_trace_id;
+extern debug_info_t *cio_debug_crw_id;
+
 #define CIO_TRACE_EVENT(imp, txt) do { \
                debug_text_event(cio_debug_trace_id, imp, txt); \
        } while (0)
@@ -15,18 +20,19 @@
                debug_sprintf_event(cio_debug_crw_id, imp , ##args); \
        } while (0)
 
-#define CIO_HEX_EVENT(imp, args...) do { \
-                debug_event(cio_debug_trace_id, imp, ##args); \
-        } while (0)
+static inline void
+CIO_HEX_EVENT(int level, void *data, int length)
+{
+       while (length > 0) {
+               debug_event(cio_debug_trace_id, level, data, length);
+               length -= cio_debug_trace_id->buf_size;
+               data += cio_debug_trace_id->buf_size;
+       }
+}
 
 #define CIO_DEBUG(printk_level,event_level,msg...) ({ \
        if (cio_show_msg) printk(printk_level msg); \
        CIO_MSG_EVENT (event_level, msg); \
 })
 
-/* for use of debug feature */
-extern debug_info_t *cio_debug_msg_id;
-extern debug_info_t *cio_debug_trace_id;
-extern debug_info_t *cio_debug_crw_id;
-
 #endif