lkml.org 
[lkml]   [2013]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH RT 2/5] a few open coded completions
    3.4.72-rt90-rc1 stable review patch.
    If anyone has any objections, please let me know.

    ------------------

    From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

    Cc: stable-rt@vger.kernel.org
    Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    drivers/net/wireless/orinoco/orinoco_usb.c | 2 +-
    drivers/usb/gadget/f_fs.c | 2 +-
    drivers/usb/gadget/inode.c | 4 ++--
    include/linux/netdevice.h | 2 +-
    4 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c
    index f634d45..8152c94 100644
    --- a/drivers/net/wireless/orinoco/orinoco_usb.c
    +++ b/drivers/net/wireless/orinoco/orinoco_usb.c
    @@ -714,7 +714,7 @@ static void ezusb_req_ctx_wait(struct ezusb_priv *upriv,
    while (!ctx->done.done && msecs--)
    udelay(1000);
    } else {
    - wait_event_interruptible(ctx->done.wait,
    + swait_event_interruptible(ctx->done.wait,
    ctx->done.done);
    }
    break;
    diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
    index f52cb1a..54ea4e9 100644
    --- a/drivers/usb/gadget/f_fs.c
    +++ b/drivers/usb/gadget/f_fs.c
    @@ -1255,7 +1255,7 @@ static void ffs_data_put(struct ffs_data *ffs)
    pr_info("%s(): freeing\n", __func__);
    ffs_data_clear(ffs);
    BUG_ON(waitqueue_active(&ffs->ev.waitq) ||
    - waitqueue_active(&ffs->ep0req_completion.wait));
    + swaitqueue_active(&ffs->ep0req_completion.wait));
    kfree(ffs);
    }
    }
    diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
    index e58b164..2dfd196 100644
    --- a/drivers/usb/gadget/inode.c
    +++ b/drivers/usb/gadget/inode.c
    @@ -339,7 +339,7 @@ ep_io (struct ep_data *epdata, void *buf, unsigned len)
    spin_unlock_irq (&epdata->dev->lock);

    if (likely (value == 0)) {
    - value = wait_event_interruptible (done.wait, done.done);
    + value = swait_event_interruptible (done.wait, done.done);
    if (value != 0) {
    spin_lock_irq (&epdata->dev->lock);
    if (likely (epdata->ep != NULL)) {
    @@ -348,7 +348,7 @@ ep_io (struct ep_data *epdata, void *buf, unsigned len)
    usb_ep_dequeue (epdata->ep, epdata->req);
    spin_unlock_irq (&epdata->dev->lock);

    - wait_event (done.wait, done.done);
    + swait_event (done.wait, done.done);
    if (epdata->status == -ECONNRESET)
    epdata->status = -EINTR;
    } else {
    diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
    index 40940f5..65d8385 100644
    --- a/include/linux/netdevice.h
    +++ b/include/linux/netdevice.h
    @@ -1109,7 +1109,7 @@ struct net_device {
    unsigned char perm_addr[MAX_ADDR_LEN]; /* permanent hw address */
    unsigned char addr_assign_type; /* hw address assignment type */
    unsigned char addr_len; /* hardware address length */
    - unsigned char neigh_priv_len;
    + unsigned short neigh_priv_len;
    unsigned short dev_id; /* for shared network cards */

    spinlock_t addr_list_lock;
    --
    1.8.4.3



    \
     
     \ /
      Last update: 2013-12-11 02:21    [W:2.244 / U:0.412 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site