2 files changed, 3 insertions, 3 deletions

diff --git a/kernel/trace/kmemtrace.c b/kernel/trace/kmemtrace.c
index 7ebc58cee3bd..72b326bba005 100644
--- a/kernel/trace/kmemtrace.c
+++ b/kernel/trace/kmemtrace.c
@@ -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;
 
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 7839280ffcd8..b36d7374ceef 100644
--- 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.