diff options
| author | Antonino A. Daplas <adaplas@pol.net> | 2006-03-22 00:07:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 07:53:55 -0800 |
| commit | 8a2cda007068e838ac6494cde74c37534f04f8dc (patch) | |
| tree | dade19c25f04a0be81dad6c0cfd1342635aa930a | |
| parent | 4078006568c142a909e7889cbdc28804cec25461 (diff) | |
[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>
| -rw-r--r-- | drivers/video/i810/i810_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c index d8467c03b49f..788297e9d59e 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; |