AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Replace deprecated interruptible_sleep_on() function call with direct

Browse Source 
wait-queue usage.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Ralf Baechle 2005-02-03 13:37:41 +00:00
parent e3c4807825
commit db89a48c1f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/mips/sibyte/sb1250/bcm1250_tbprof.c
View File

@ -28,6 +28,7 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/reboot.h> #include <linux/reboot.h>
#include <linux/wait.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/sibyte/sb1250.h> #include <asm/sibyte/sb1250.h>
@ -231,6 +232,7 @@ int sbprof_zbprof_start(struct file *filp)
int sbprof_zbprof_stop(void) int sbprof_zbprof_stop(void)
{ {
DEFINE_WAIT(wait);
DBG(printk(DEVNAME ": stopping\n")); DBG(printk(DEVNAME ": stopping\n"));
if (sbp.tb_enable) { if (sbp.tb_enable) {
@ -240,7 +242,9 @@ int sbprof_zbprof_stop(void)
this sleep happens. */ this sleep happens. */
if (sbp.tb_armed) { if (sbp.tb_armed) {
DBG(printk(DEVNAME ": wait for disarm\n")); 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")); DBG(printk(DEVNAME ": disarm complete\n"));
} }
free_irq(K_INT_TRACE_FREEZE, &sbp); free_irq(K_INT_TRACE_FREEZE, &sbp);
@ -348,7 +352,10 @@ static int sbprof_tb_ioctl(struct inode *inode,
error = sbprof_zbprof_stop(); error = sbprof_zbprof_stop();
break; break;
case SBPROF_ZBWAITFULL: 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? */ /* XXXKW check if interrupted? */
return put_user(TB_FULL, (int *) arg); return put_user(TB_FULL, (int *) arg);
default: default: