Merge Linus' tree.

[linux-2.6-omap-h63xx.git] / drivers / oprofile / cpu_buffer.c

diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index 026f671ea55870bcecfe82e510004d33967eb5ad..78193e4bbdb564981a98b00437bdad6a8b851500 100644 (file)
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -52,7 +52,8 @@ int alloc_cpu_buffers(void)
        for_each_online_cpu(i) {
                struct oprofile_cpu_buffer * b = &cpu_buffer[i];
  
-               b->buffer = vmalloc(sizeof(struct op_sample) * buffer_size);
+               b->buffer = vmalloc_node(sizeof(struct op_sample) * buffer_size,
+                       cpu_to_node(i));
                if (!b->buffer)
                        goto fail;