Skip to content

Commit

Permalink
[PATCH] i810fb_cursor(): use GFP_ATOMIC
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Antonino A. Daplas authored and Linus Torvalds committed Mar 22, 2006
1 parent 4078006 commit 8a2cda0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/video/i810/i810_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 8a2cda0

Please sign in to comment.