lkml.org 
[lkml]   [2009]   [Jun]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [GIT PULL v2] Early boot SLAB for 2.6.31
On Thu, 11 Jun 2009, Ingo Molnar wrote:
> Wasnt this supposed to have gone away with this tree?

Yes, if I hadn't messed up the merge conflict fixup. :-) I am not hitting
that with my configuration, btw.

Pekka

From fc1ebbcad1d86b67deed4442df9445cc81061c85 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Thu, 11 Jun 2009 14:46:49 +0300
Subject: [PATCH] irq: use kcalloc() instead of the bootmem allocator

Fixes the following problem:

[ 0.000000] Experimental hierarchical RCU init done.
[ 0.000000] NR_IRQS:4352 nr_irqs:256
[ 0.000000] ------------[ cut here ]------------
[ 0.000000] WARNING: at mm/bootmem.c:537 alloc_arch_preferred_bootmem+0x40/0x7e()
[ 0.000000] Hardware name: To Be Filled By O.E.M.
[ 0.000000] Pid: 0, comm: swapper Not tainted 2.6.30-tip-02161-g7a74539-dirty #59709
[ 0.000000] Call Trace:
[ 0.000000] [<ffffffff823f8c8e>] ? alloc_arch_preferred_bootmem+0x40/0x7e
[ 0.000000] [<ffffffff81067168>] warn_slowpath_common+0x88/0xcb
[ 0.000000] [<ffffffff810671d2>] warn_slowpath_null+0x27/0x3d
[ 0.000000] [<ffffffff823f8c8e>] alloc_arch_preferred_bootmem+0x40/0x7e
[ 0.000000] [<ffffffff823f9307>] ___alloc_bootmem_nopanic+0x4e/0xec
[ 0.000000] [<ffffffff823f93c5>] ___alloc_bootmem+0x20/0x61
[ 0.000000] [<ffffffff823f962e>] __alloc_bootmem+0x1e/0x34
[ 0.000000] [<ffffffff823f757c>] early_irq_init+0x6d/0x118
[ 0.000000] [<ffffffff823e0140>] ? early_idt_handler+0x0/0x71
[ 0.000000] [<ffffffff823e0cf7>] start_kernel+0x192/0x394
[ 0.000000] [<ffffffff823e0140>] ? early_idt_handler+0x0/0x71
[ 0.000000] [<ffffffff823e02ad>] x86_64_start_reservations+0xb4/0xcf
[ 0.000000] [<ffffffff823e0000>] ? __init_begin+0x0/0x140
[ 0.000000] [<ffffffff823e0420>] x86_64_start_kernel+0x158/0x17b
[ 0.000000] ---[ end trace a7919e7f17c0a725 ]---
[ 0.000000] Fast TSC calibration using PIT
[ 0.000000] Detected 2002.510 MHz processor.
[ 0.004000] Console: colour VGA+ 80x25

Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
kernel/irq/handle.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index e161999..1045785 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -164,7 +164,7 @@ int __init early_irq_init(void)
node = first_online_node;

/* allocate irq_desc_ptrs array based on nr_irqs */
- irq_desc_ptrs = alloc_bootmem(nr_irqs * sizeof(void *));
+ irq_desc_ptrs = kcalloc(nr_irqs, sizeof(void *), GFP_NOWAIT);

/* allocate based on nr_cpu_ids */
kstat_irqs_legacy = kzalloc_node(NR_IRQS_LEGACY * nr_cpu_ids *
--
1.6.0.4


\
 
 \ /
  Last update: 2009-06-11 13:53    [W:0.129 / U:0.084 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site