Commit 8a2cda00 authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds

[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: default avatarAntonino Daplas <adaplas@pol.net>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 40780065
...@@ -1508,7 +1508,7 @@ static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor) ...@@ -1508,7 +1508,7 @@ static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
int size = ((cursor->image.width + 7) >> 3) * int size = ((cursor->image.width + 7) >> 3) *
cursor->image.height; cursor->image.height;
int i; int i;
u8 *data = kmalloc(64 * 8, GFP_KERNEL); u8 *data = kmalloc(64 * 8, GFP_ATOMIC);
if (data == NULL) if (data == NULL)
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment