Commit 299297c6 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'core-fixes-for-linus' of...

Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  oprofile: fix cpu buffer size
parents e2a1b9ee 54f2c841
...@@ -78,16 +78,20 @@ void free_cpu_buffers(void) ...@@ -78,16 +78,20 @@ void free_cpu_buffers(void)
op_ring_buffer_write = NULL; op_ring_buffer_write = NULL;
} }
#define RB_EVENT_HDR_SIZE 4
int alloc_cpu_buffers(void) int alloc_cpu_buffers(void)
{ {
int i; int i;
unsigned long buffer_size = oprofile_cpu_buffer_size; unsigned long buffer_size = oprofile_cpu_buffer_size;
unsigned long byte_size = buffer_size * (sizeof(struct op_sample) +
RB_EVENT_HDR_SIZE);
op_ring_buffer_read = ring_buffer_alloc(buffer_size, OP_BUFFER_FLAGS); op_ring_buffer_read = ring_buffer_alloc(byte_size, OP_BUFFER_FLAGS);
if (!op_ring_buffer_read) if (!op_ring_buffer_read)
goto fail; goto fail;
op_ring_buffer_write = ring_buffer_alloc(buffer_size, OP_BUFFER_FLAGS); op_ring_buffer_write = ring_buffer_alloc(byte_size, OP_BUFFER_FLAGS);
if (!op_ring_buffer_write) if (!op_ring_buffer_write)
goto fail; goto fail;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment