From: Steven Rostedt <rostedt@goodmis.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: linux-kernel@vger.kernel.org,
linux-rt-users <linux-rt-users@vger.kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Carsten Emde <C.Emde@osadl.org>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
John Kacur <jkacur@redhat.com>,
Corey Minyard <cminyard@mvista.com>
Subject: Re: [PATCH RT 2/5] a few open coded completions
Date: Wed, 11 Dec 2013 14:49:46 -0500 [thread overview]
Message-ID: <20131211144946.27d82a78@gandalf.local.home> (raw)
In-Reply-To: <20131211003801.836995968@goodmis.org>
Here's the new patch:
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Mon, 28 Oct 2013 11:50:06 +0100
Subject: [PATCH] swait: Add a few more users
The wait-simple queue is lighter weight and more efficient than the full
wait queue, and may be used in atomic context on PREEMPT_RT.
Fix up some places that needed to call the swait_*() functions instead
of the wait_*() functions.
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 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c
index 1f9cb55..a28f298 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 b6e9d91..35d9c53 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -1282,7 +1282,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->dev_name);
kfree(ffs);
}
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index 570c005..c60233d 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -340,7 +340,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)) {
@@ -349,7 +349,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 {
--
1.8.4.3
next prev parent reply other threads:[~2013-12-11 19:49 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-11 0:37 [PATCH RT 0/5] Linux 3.10.22-rt20-rc1 Steven Rostedt
2013-12-11 0:37 ` [PATCH RT 1/5] cpu_down: move migrate_enable() back Steven Rostedt
2013-12-11 0:37 ` [PATCH RT 2/5] a few open coded completions Steven Rostedt
2013-12-11 14:25 ` Corey Minyard
2013-12-11 15:34 ` Steven Rostedt
2013-12-15 15:28 ` Sebastian Andrzej Siewior
2013-12-15 21:08 ` Steven Rostedt
2013-12-11 19:49 ` Steven Rostedt [this message]
2014-03-09 0:27 ` Ben Hutchings
2014-03-10 14:29 ` Steven Rostedt
2014-03-10 17:52 ` Ben Hutchings
2014-03-10 18:14 ` Steven Rostedt
2014-03-11 2:06 ` Ben Hutchings
2014-03-11 2:56 ` Steven Rostedt
2014-03-11 15:54 ` Steven Rostedt
2014-03-12 18:15 ` Ben Hutchings
2013-12-11 0:37 ` [PATCH RT 3/5] lockdep: Correctly annotate hardirq context in irq_exit() Steven Rostedt
2013-12-11 0:37 ` [PATCH RT 4/5] rtmutex: use a trylock for waiter lock in trylock Steven Rostedt
2013-12-11 0:37 ` [PATCH RT 5/5] Linux 3.10.22-rt20-rc1 Steven Rostedt
-- strict thread matches above, loose matches on Subject: below --
2013-12-11 0:46 [PATCH RT 0/5] Linux 3.8.13.13-rt26-rc1 Steven Rostedt
2013-12-11 0:46 ` [PATCH RT 2/5] a few open coded completions Steven Rostedt
2013-12-11 19:54 ` Steven Rostedt
2013-12-11 0:50 [PATCH RT 0/5] Linux 3.4.72-rt90-rc1 Steven Rostedt
2013-12-11 0:50 ` [PATCH RT 2/5] a few open coded completions Steven Rostedt
2013-12-11 19:57 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131211144946.27d82a78@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=C.Emde@osadl.org \
--cc=bigeasy@linutronix.de \
--cc=cminyard@mvista.com \
--cc=jkacur@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).