From 2e74dea04b7c1ec59c17ca61b1b5c678a3690987 Mon Sep 17 00:00:00 2001
From: "Antonino A. Daplas" <adaplas@pol.net>
Date: Wed, 22 Mar 2006 00:07:36 -0800
Subject: [PATCH] --- yaml --- r: 22422 b: refs/heads/master c:
 8a2cda007068e838ac6494cde74c37534f04f8dc h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 45478ec9433b..cb2789c86801 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4078006568c142a909e7889cbdc28804cec25461
+refs/heads/master: 8a2cda007068e838ac6494cde74c37534f04f8dc
diff --git a/trunk/drivers/video/i810/i810_main.c b/trunk/drivers/video/i810/i810_main.c
index d8467c03b49f..788297e9d59e 100644
--- a/trunk/drivers/video/i810/i810_main.c
+++ b/trunk/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;