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

2009-01-27 14:30:57 +01:00
parent 32c0bd9624 cc2f6d90e9 ba2607fe9c
commit 4a66a82be7
2 changed files with 3 additions and 3 deletions
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -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.