diff options
Diffstat (limited to 'drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h')
| -rw-r--r-- | drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h index 30098f39181f..8888b2756174 100644 --- a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h +++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h @@ -80,7 +80,7 @@ struct ptldebug_header { __u32 ph_pid; __u32 ph_extern_pid; __u32 ph_line_num; -} __attribute__((packed)); +} __packed; #define PH_FLAG_FIRST_RECORD 1 @@ -265,9 +265,9 @@ int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata, /* other external symbols that tracefile provides: */ int cfs_trace_copyin_string(char *knl_buffer, int knl_buffer_nob, - const char *usr_buffer, int usr_buffer_nob); -int cfs_trace_copyout_string(char *usr_buffer, int usr_buffer_nob, - const char *knl_buffer, char *append); + const char __user *usr_buffer, int usr_buffer_nob); +int cfs_trace_copyout_string(char __user *usr_buffer, int usr_buffer_nob, + const char *knl_buffer, char *append); #define LIBCFS_DEBUG_FILE_PATH_DEFAULT "/tmp/lustre-log" |