From 01742fdb697c8d1e40601f45dbce6aaf9551dc85 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 31 Mar 2009 15:25:01 -0700
Subject: [PATCH] --- yaml --- r: 139242 b: refs/heads/master c:
 6e6fe42227e23a379d3c70f6ff257131399e4075 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1403d59f4f55..a05f6764bed0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa7af8b1bb6dfca7a0c8541683a9bfffbc8dd345
+refs/heads/master: 6e6fe42227e23a379d3c70f6ff257131399e4075
diff --git a/trunk/drivers/video/uvesafb.c b/trunk/drivers/video/uvesafb.c
index 74ae75899009..398fd25e0810 100644
--- a/trunk/drivers/video/uvesafb.c
+++ b/trunk/drivers/video/uvesafb.c
@@ -189,7 +189,7 @@ static int uvesafb_exec(struct uvesafb_ktask *task)
 	uvfb_tasks[seq] = task;
 	mutex_unlock(&uvfb_lock);
 
-	err = cn_netlink_send(m, 0, gfp_any());
+	err = cn_netlink_send(m, 0, GFP_KERNEL);
 	if (err == -ESRCH) {
 		/*
 		 * Try to start the userspace helper if sending