---

yaml --- r: 322469 b: refs/heads/master c: 72caa5f h: refs/heads/master i: 322467: 6bc5cbd v: v3
git-mirror · Aug 23, 2012 · 7c4b546 · 7c4b546
1 parent 41267fb
commit 7c4b546
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 	}