From ba327c1f46e4979db09bd7f703f8791f03bc6f09 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Thu, 2 Oct 2008 11:04:14 +0200 Subject: [PATCH] --- yaml --- r: 116667 b: refs/heads/master c: 77ae11f63befb7fc41ec256f1fcb72ca7e4160d5 h: refs/heads/master i: 116665: d9d58db94cce39beeffd1946a19089d7b7bff77e 116663: d316e4f942447f87a4326c8c8650622d65edf6b8 v: v3 --- [refs] | 2 +- trunk/kernel/trace/ring_buffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dcf04de6b43a..ff1e950f15c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38697053fa006411224a1790e2adb8216440ab0f +refs/heads/master: 77ae11f63befb7fc41ec256f1fcb72ca7e4160d5 diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c index 98145718988d..54a30986493a 100644 --- a/trunk/kernel/trace/ring_buffer.c +++ b/trunk/kernel/trace/ring_buffer.c @@ -232,7 +232,7 @@ static int rb_allocate_pages(struct ring_buffer_per_cpu *cpu_buffer, for (i = 0; i < nr_pages; i++) { page = kzalloc_node(ALIGN(sizeof(*page), cache_line_size()), - GFP_KERNEL, cpu_to_node(cpu)); + GFP_KERNEL, cpu_to_node(i)); if (!page) goto free_pages; list_add(&page->list, &pages);