X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-s390%2Fdebug.h;h=3148d5b2ca362b4b94080553e774aeed3b40de33;hb=9213980e6a70d8473e0ffd4b39ab5b6caaba9ff5;hp=c266fe9fa0aa023c9eae4939fe9bed1f7a0fa0b3;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git diff --git a/include/asm-s390/debug.h b/include/asm-s390/debug.h index c266fe9fa..3148d5b2c 100644 --- 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;