From: domen@coderock.org
To: ralf@linux-mips.org
Cc: linux-mips@linux-mips.org, domen@coderock.org, nacc@us.ibm.com
Subject: [patch 7/8] mips/bcm1250_tbprof: remove interruptible_sleep_on() usage
Date: Sun, 06 Mar 2005 11:46:06 +0100 [thread overview]
Message-ID: <20050306104607.1D8C11F23D@trashy.coderock.org> (raw)
Remove deprecated interruptible_sleep_on() function call
and replace with direct wait-queue usage.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
---
kj-domen/arch/mips/sibyte/sb1250/bcm1250_tbprof.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff -puN arch/mips/sibyte/sb1250/bcm1250_tbprof.c~int_sleep_on-arch_mips_sibyte_sb1250_bcm1250_tbprof arch/mips/sibyte/sb1250/bcm1250_tbprof.c
--- kj/arch/mips/sibyte/sb1250/bcm1250_tbprof.c~int_sleep_on-arch_mips_sibyte_sb1250_bcm1250_tbprof 2005-03-05 16:12:04.000000000 +0100
+++ kj-domen/arch/mips/sibyte/sb1250/bcm1250_tbprof.c 2005-03-05 16:12:04.000000000 +0100
@@ -28,6 +28,7 @@
#include <linux/fs.h>
#include <linux/errno.h>
#include <linux/reboot.h>
+#include <linux/wait.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/sibyte/sb1250.h>
@@ -231,6 +232,7 @@ int sbprof_zbprof_start(struct file *fil
int sbprof_zbprof_stop(void)
{
+ DEFINE_WAIT(wait);
DBG(printk(DEVNAME ": stopping\n"));
if (sbp.tb_enable) {
@@ -240,7 +242,9 @@ int sbprof_zbprof_stop(void)
this sleep happens. */
if (sbp.tb_armed) {
DBG(printk(DEVNAME ": wait for disarm\n"));
- interruptible_sleep_on(&sbp.tb_sync);
+ prepare_to_wait(&sbp.tb_sync, &wait, TASK_INTERRUPTIBLE);
+ schedule();
+ finish_wait(&sbp.tb_sync, &wait);
DBG(printk(DEVNAME ": disarm complete\n"));
}
free_irq(K_INT_TRACE_FREEZE, &sbp);
@@ -348,7 +352,10 @@ static int sbprof_tb_ioctl(struct inode
error = sbprof_zbprof_stop();
break;
case SBPROF_ZBWAITFULL:
- interruptible_sleep_on(&sbp.tb_read);
+ DEFINE_WAIT(wait);
+ prepare_to_wait(&sbp.tb_read, &wait, TASK_INTERRUPTIBLE);
+ schedule();
+ finish_wait(&sbp.tb_read, &wait);
/* XXXKW check if interrupted? */
return put_user(TB_FULL, (int *) arg);
default:
_
next reply other threads:[~2005-03-06 10:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-03-06 10:46 domen [this message]
-- strict thread matches above, loose matches on Subject: below --
2005-06-20 21:49 [patch 7/8] mips/bcm1250_tbprof: remove interruptible_sleep_on() usage domen
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=20050306104607.1D8C11F23D@trashy.coderock.org \
--to=domen@coderock.org \
--cc=linux-mips@linux-mips.org \
--cc=nacc@us.ibm.com \
--cc=ralf@linux-mips.org \
/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