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 / net / ctcdbug.h

diff --git a/drivers/s390/net/ctcdbug.h b/drivers/s390/net/ctcdbug.h
index 447fd1a..413925e 100644 (file)
--- a/drivers/s390/net/ctcdbug.h
+++ b/drivers/s390/net/ctcdbug.h
@@ -1,16 +1,14 @@
 /*
  *
- * linux/drivers/s390/net/ctcdbug.h ($Revision: 1.1 $)
+ * linux/drivers/s390/net/ctcdbug.h
  *
- * Linux on zSeries OSA Express and HiperSockets support
+ * CTC / ESCON network driver - s390 dbf exploit.
  *
  * Copyright 2000,2003 IBM Corporation
  *
  *    Author(s): Original Code written by
  *                       Peter Tiedemann (ptiedem@de.ibm.com)
  *
- *    $Revision: 1.1 $  $Date: 2004/07/02 16:31:22 $
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2, or (at your option)
@@ -25,64 +23,66 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
+#ifndef _CTCDBUG_H_
+#define _CTCDBUG_H_
 
 #include <asm/debug.h>
+#include "ctcmain.h"
 /**
  * Debug Facility stuff
  */
 #define CTC_DBF_SETUP_NAME "ctc_setup"
 #define CTC_DBF_SETUP_LEN 16
-#define CTC_DBF_SETUP_INDEX 3
+#define CTC_DBF_SETUP_PAGES 8
 #define CTC_DBF_SETUP_NR_AREAS 1
 #define CTC_DBF_SETUP_LEVEL 3
 
 #define CTC_DBF_DATA_NAME "ctc_data"
 #define CTC_DBF_DATA_LEN 128
-#define CTC_DBF_DATA_INDEX 3
+#define CTC_DBF_DATA_PAGES 8
 #define CTC_DBF_DATA_NR_AREAS 1
-#define CTC_DBF_DATA_LEVEL 2
+#define CTC_DBF_DATA_LEVEL 3
 
 #define CTC_DBF_TRACE_NAME "ctc_trace"
 #define CTC_DBF_TRACE_LEN 16
-#define CTC_DBF_TRACE_INDEX 2
+#define CTC_DBF_TRACE_PAGES 4
 #define CTC_DBF_TRACE_NR_AREAS 2
 #define CTC_DBF_TRACE_LEVEL 3
 
 #define DBF_TEXT(name,level,text) \
        do { \
-               debug_text_event(dbf_##name,level,text); \
+               debug_text_event(ctc_dbf_##name,level,text); \
        } while (0)
 
 #define DBF_HEX(name,level,addr,len) \
        do { \
-               debug_event(dbf_##name,level,(void*)(addr),len); \
+               debug_event(ctc_dbf_##name,level,(void*)(addr),len); \
        } while (0)
 
-extern DEFINE_PER_CPU(char[256], dbf_txt_buf);
-extern debug_info_t *dbf_setup;
-extern debug_info_t *dbf_data;
-extern debug_info_t *dbf_trace;
+DECLARE_PER_CPU(char[256], ctc_dbf_txt_buf);
+extern debug_info_t *ctc_dbf_setup;
+extern debug_info_t *ctc_dbf_data;
+extern debug_info_t *ctc_dbf_trace;
 
 
 #define DBF_TEXT_(name,level,text...)                          \
        do {                                                            \
-               char* dbf_txt_buf = get_cpu_var(dbf_txt_buf);   \
-               sprintf(dbf_txt_buf, text);                             \
-               debug_text_event(dbf_##name,level,dbf_txt_buf); \
-               put_cpu_var(dbf_txt_buf);                               \
+               char* ctc_dbf_txt_buf = get_cpu_var(ctc_dbf_txt_buf);   \
+               sprintf(ctc_dbf_txt_buf, text);                         \
+               debug_text_event(ctc_dbf_##name,level,ctc_dbf_txt_buf); \
+               put_cpu_var(ctc_dbf_txt_buf);                           \
        } while (0)
 
 #define DBF_SPRINTF(name,level,text...) \
        do { \
-               debug_sprintf_event(dbf_trace, level, ##text ); \
-               debug_sprintf_event(dbf_trace, level, text ); \
+               debug_sprintf_event(ctc_dbf_trace, level, ##text ); \
+               debug_sprintf_event(ctc_dbf_trace, level, text ); \
        } while (0)
 
 
-int register_dbf_views(void);
+int ctc_register_dbf_views(void);
 
-void unregister_dbf_views(void);
+void ctc_unregister_dbf_views(void);
 
 /**
  * some more debug stuff
@@ -121,3 +121,5 @@ hex_dump(unsigned char *buf, size_t len)
        printk("\n");
 }
 
+
+#endif