lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge ../bleed-2.6

Browse Source
This commit is contained in:
Greg KH
2005-10-28 10:13:16 -07:00
committed by Greg Kroah-Hartman
parent 1a222bca26 27d1097d39
commit 6fbfddcb52
591 changed files with 23717 additions and 10531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/kobject_uevent.c
View File

@@ -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;