From 98319ed94364e58f04d173ffa074ad85064cd694 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Wed, 14 Oct 2009 16:36:26 +0200 Subject: [PATCH] --- yaml --- r: 173205 b: refs/heads/master c: f96d3015e9f7f7fff4cab7ed1d467664cc980061 h: refs/heads/master i: 173203: 3b4ca873ebd09e398055c656cb4894ecaa66d91c v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ce5e6011adc5..89689a53132d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2a7be0be1099c2554f4705d2c1c5081f8f96efc +refs/heads/master: f96d3015e9f7f7fff4cab7ed1d467664cc980061 diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_file_ops.c b/trunk/drivers/infiniband/hw/ipath/ipath_file_ops.c index 40dbe54056c7..73933a41ce84 100644 --- a/trunk/drivers/infiniband/hw/ipath/ipath_file_ops.c +++ b/trunk/drivers/infiniband/hw/ipath/ipath_file_ops.c @@ -1821,7 +1821,6 @@ static int find_shared_port(struct file *fp, static int ipath_open(struct inode *in, struct file *fp) { /* The real work is performed later in ipath_assign_port() */ - cycle_kernel_lock(); fp->private_data = kzalloc(sizeof(struct ipath_filedata), GFP_KERNEL); return fp->private_data ? 0 : -ENOMEM; }