Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 131575
b: refs/heads/master
c: 41a9e64
h: refs/heads/master
i:
  131573: 4a570b6
  131571: e7a4ad7
  131567: 4163660
v: v3
  • Loading branch information
Luca Bigliardi authored and Linus Torvalds committed Feb 21, 2009
1 parent 6bef100 commit e4d3a14
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 620565ef5f35f4196e5081417db381c16b0ae791
refs/heads/master: 41a9e64ca4d60dc412cfcd42d5be5dec1f1ed427
6 changes: 3 additions & 3 deletions trunk/arch/um/drivers/vde_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ void vde_init_libstuff(struct vde_data *vpri, struct vde_init *init)
{
struct vde_open_args *args;

vpri->args = kmalloc(sizeof(struct vde_open_args), UM_GFP_KERNEL);
vpri->args = uml_kmalloc(sizeof(struct vde_open_args), UM_GFP_KERNEL);
if (vpri->args == NULL) {
printk(UM_KERN_ERR "vde_init_libstuff - vde_open_args "
"allocation failed");
Expand All @@ -91,8 +91,8 @@ void vde_init_libstuff(struct vde_data *vpri, struct vde_init *init)
args->group = init->group;
args->mode = init->mode ? init->mode : 0700;

args->port ? printk(UM_KERN_INFO "port %d", args->port) :
printk(UM_KERN_INFO "undefined port");
args->port ? printk("port %d", args->port) :
printk("undefined port");
}

int vde_user_read(void *conn, void *buf, int len)
Expand Down

0 comments on commit e4d3a14

Please sign in to comment.