Messages in this thread Patch in this message | | | Subject | [PATCH 2/2] UML memory hotplug cleanups | Date | Thu, 06 Apr 2006 12:55:27 -0400 | From | Jeff Dike <> |
| |
Change memory hotplug to use GFP_NOWAIT instead of GFP_ATOMIC, so that it will grab memory without sleeping, but doesn't try to use the emergency pools.
A small list initialization suggested by Daniel Phillips - don't initialize lists which are just about to be list_add-ed.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Index: linux-2.6.16/arch/um/drivers/mconsole_kern.c =================================================================== --- linux-2.6.16.orig/arch/um/drivers/mconsole_kern.c 2006-04-06 12:10:41.000000000 -0400 +++ linux-2.6.16/arch/um/drivers/mconsole_kern.c 2006-04-06 12:21:07.000000000 -0400 @@ -87,7 +87,7 @@ static irqreturn_t mconsole_interrupt(in if(req.cmd->context == MCONSOLE_INTR) (*req.cmd->handler)(&req); else { - new = kmalloc(sizeof(*new), GFP_ATOMIC); + new = kmalloc(sizeof(*new), GFP_NOWAIT); if(new == NULL) mconsole_reply(&req, "Out of memory", 1, 0); else { @@ -415,7 +415,6 @@ static int mem_config(char *str) unplugged = page_address(page); if(unplug_index == UNPLUGGED_PER_PAGE){ - INIT_LIST_HEAD(&unplugged->list); list_add(&unplugged->list, &unplugged_pages); unplug_index = 0; } @@ -655,7 +654,6 @@ static void with_console(struct mc_reque struct mconsole_entry entry; unsigned long flags; - INIT_LIST_HEAD(&entry.list); entry.request = *req; list_add(&entry.list, &clients); spin_lock_irqsave(&console_lock, flags); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |