renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 20:23:57 +08:00
Code

Merge branches 'tracing/blktrace', 'tracing/kmemtrace' and 'tracing/urgent' into tracing/core

Browse Source
This commit is contained in:
Ingo Molnar 2009-01-27 14:30:57 +01:00
commit 4a66a82be7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/trace/kmemtrace.c
View File

@ -139,12 +139,12 @@ kmemtrace_print_alloc_compress(struct trace_iterator *iter,
return TRACE_TYPE_PARTIAL_LINE;
/* Requested */
ret = trace_seq_printf(s, "%4ld ", entry->bytes_req);
ret = trace_seq_printf(s, "%4zd ", entry->bytes_req);
if (!ret)
return TRACE_TYPE_PARTIAL_LINE;
/* Allocated */
ret = trace_seq_printf(s, "%4ld ", entry->bytes_alloc);
ret = trace_seq_printf(s, "%4zd ", entry->bytes_alloc);
if (!ret)
return TRACE_TYPE_PARTIAL_LINE;

2
kernel/trace/ring_buffer.c
View File

@ -244,7 +244,7 @@ static inline int test_time_stamp(u64 delta)
return 0;
}
#define BUF_PAGE_SIZE (PAGE_SIZE - sizeof(struct buffer_data_page))
#define BUF_PAGE_SIZE (PAGE_SIZE - offsetof(struct buffer_data_page, data))
/*
* head_page == tail_page && head == tail then buffer is empty.