Merge ../bleed-2.6

[linux-drm-fsl-dcu.git] / lib / kobject_uevent.c

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index a318330d254acd2d418698778970319f25406183..3ab375411e38d62828133e631bd8e8cfd3d77196 100644 (file)
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -62,7 +62,7 @@ static struct sock *uevent_sock;
  * @gfp_mask:
  */
 static int send_uevent(const char *signal, const char *obj,
-                      char **envp, int gfp_mask)
+                      char **envp, gfp_t gfp_mask)
 {
        struct sk_buff *skb;
        char *pos;
@@ -98,7 +98,7 @@ static int send_uevent(const char *signal, const char *obj,
 }
 
 static int do_kobject_uevent(struct kobject *kobj, enum kobject_action action, 
-                            struct attribute *attr, int gfp_mask)
+                            struct attribute *attr, gfp_t gfp_mask)
 {
        char *path;
        char *attrpath;