From 7c4b546e72d80d9a4fd0286be5b9a4f616105f85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bruno=20Pr=C3=A9mont?= <bonbons@linux-vserver.org>
Date: Mon, 30 Jul 2012 21:09:49 +0200
Subject: [PATCH] --- yaml --- r: 322469 b: refs/heads/master c:
 72caa5fb948ef818fe1332848e9c61b10687ce7a h: refs/heads/master i:   322467:
 6bc5cbd7c509e9319fa329e0ea8750764b726071 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/video/console/bitblit.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 132af10c6db7..9020bf3e6d96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e432964a3c5ce517fd93101ae3875172ee958b65
+refs/heads/master: 72caa5fb948ef818fe1332848e9c61b10687ce7a
diff --git a/trunk/drivers/video/console/bitblit.c b/trunk/drivers/video/console/bitblit.c
index 28b1a834906b..61b182bf32a2 100644
--- a/trunk/drivers/video/console/bitblit.c
+++ b/trunk/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;
 	}