diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-17 04:17:25 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-17 04:17:25 +0400 |
| commit | 6a2a2cdd57d11ee3117539b846a45df6efbd35b1 (patch) | |
| tree | b6ab218810666a75d6612bde4d4a224118c0834c /drivers/video/console/bitblit.c | |
| parent | 8e360ec82322358056786e651322085af3ef6960 (diff) | |
| parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff) | |
| download | linux-6a2a2cdd57d11ee3117539b846a45df6efbd35b1.tar.xz | |
Merge 3.6-rc6 into staging-next
This pulls in the staging tree fixes in 3.6-rc6 into our branch to resolve the
merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video/console/bitblit.c')
| -rw-r--r-- | drivers/video/console/bitblit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c index 28b1a834906b..61b182bf32a2 100644 --- a/drivers/video/console/bitblit.c +++ b/drivers/video/console/bitblit.c @@ -162,7 +162,7 @@ static void bit_putcs(struct vc_data *vc, struct fb_info *info, image.depth = 1; if (attribute) { - buf = kmalloc(cellsize, GFP_KERNEL); + buf = kmalloc(cellsize, GFP_ATOMIC); if (!buf) return; } |