Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750831AbWCYE1v (ORCPT ); Fri, 24 Mar 2006 23:27:51 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750853AbWCYE1u (ORCPT ); Fri, 24 Mar 2006 23:27:50 -0500 Received: from dsl093-040-174.pdx1.dsl.speakeasy.net ([66.93.40.174]:55228 "EHLO aria.kroah.org") by vger.kernel.org with ESMTP id S1750847AbWCYE1n (ORCPT ); Fri, 24 Mar 2006 23:27:43 -0500 Date: Fri, 24 Mar 2006 20:27:23 -0800 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org, torvalds@osdl.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , akpm@osdl.org, alan@lxorguk.ukuu.org.uk, adaplas@pol.net, Chris Wright , Greg Kroah-Hartman Subject: [patch 12/20] i810fb_cursor(): use GFP_ATOMIC Message-ID: <20060325042723.GM21260@kroah.com> References: <20060325041355.180237000@quad.kroah.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="i810fb_cursor-use-gfp_atomic.patch" In-Reply-To: <20060325042556.GA21260@kroah.com> User-Agent: Mutt/1.5.11 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1181 Lines: 35 -stable review patch. If anyone has any objections, please let us know. ------------------ From: "Antonino A. Daplas" The console cursor can be called in atomic context. Change memory allocation to use the GFP_ATOMIC flag in i810fb_cursor(). Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- drivers/video/i810/i810_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- linux-2.6.16.orig/drivers/video/i810/i810_main.c +++ linux-2.6.16/drivers/video/i810/i810_main.c @@ -1508,7 +1508,7 @@ static int i810fb_cursor(struct fb_info int size = ((cursor->image.width + 7) >> 3) * cursor->image.height; int i; - u8 *data = kmalloc(64 * 8, GFP_KERNEL); + u8 *data = kmalloc(64 * 8, GFP_ATOMIC); if (data == NULL) return -ENOMEM; -- - 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/