From: Antonino A. Daplas <adaplas@pol.net> Date: Wed, 22 Mar 2006 08:07:36 +0000 (-0800) Subject: [PATCH] i810fb_cursor(): use GFP_ATOMIC X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8a2cda007068e838ac6494cde74c37534f04f8dc;p=linux.git [PATCH] i810fb_cursor(): use GFP_ATOMIC 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 <adaplas@pol.net> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> --- diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c index d8467c03b49f6..788297e9d59e1 100644 --- a/drivers/video/i810/i810_main.c +++ b/drivers/video/i810/i810_main.c @@ -1508,7 +1508,7 @@ static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor) 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;