patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / include / asm-s390 / debug.h

diff --git a/include/asm-s390/debug.h b/include/asm-s390/debug.h
index c266fe9..3148d5b 100644 (file)
--- a/include/asm-s390/debug.h
+++ b/include/asm-s390/debug.h
@@ -91,7 +91,8 @@ typedef int (debug_prolog_proc_t) (debug_info_t* id,
                                   char* out_buf);
 typedef int (debug_input_proc_t) (debug_info_t* id,
                                  struct debug_view* view,
-                                 struct file* file, const char* user_buf,
+                                 struct file* file,
+                                 const char __user *user_buf,
                                  size_t in_buf_size, loff_t* offset);
 
 int debug_dflt_header_fn(debug_info_t* id, struct debug_view* view,
@@ -234,26 +235,6 @@ int debug_unregister_view(debug_info_t* id, struct debug_view* view);
 #define PRINT_FATAL(x...) printk ( KERN_DEBUG PRINTK_HEADER x )
 #endif                         /* DASD_DEBUG */
 
-#if DASD_DEBUG > 4
-#define INTERNAL_ERROR(x...) PRINT_FATAL ( INTERNAL_ERRMSG ( x ) )
-#elif DASD_DEBUG > 2
-#define INTERNAL_ERROR(x...) PRINT_ERR ( INTERNAL_ERRMSG ( x ) )
-#elif DASD_DEBUG > 0
-#define INTERNAL_ERROR(x...) PRINT_WARN ( INTERNAL_ERRMSG ( x ) )
-#else
-#define INTERNAL_ERROR(x...)
-#endif                         /* DASD_DEBUG */
-
-#if DASD_DEBUG > 5
-#define INTERNAL_CHECK(x...) PRINT_FATAL ( INTERNAL_CHKMSG ( x ) )
-#elif DASD_DEBUG > 3
-#define INTERNAL_CHECK(x...) PRINT_ERR ( INTERNAL_CHKMSG ( x ) )
-#elif DASD_DEBUG > 1
-#define INTERNAL_CHECK(x...) PRINT_WARN ( INTERNAL_CHKMSG ( x ) )
-#else
-#define INTERNAL_CHECK(x...)
-#endif                         /* DASD_DEBUG */
-
 #undef DEBUG_MALLOC
 #ifdef DEBUG_MALLOC
 void *b;