提交 db89a48c 编写于 作者: R Ralf Baechle

Replace deprecated interruptible_sleep_on() function call with direct

wait-queue usage.
Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
上级 e3c48078
master alk-4.19.24 alk-4.19.30 alk-4.19.34 alk-4.19.36 alk-4.19.43 alk-4.19.48 alk-4.19.57 ck-4.19.67 ck-4.19.81 ck-4.19.91 github/fork/deepanshu1422/fix-typo-in-comment github/fork/haosdent/fix-typo linux-next v4.19.91 v4.19.90 v4.19.89 v4.19.88 v4.19.87 v4.19.86 v4.19.85 v4.19.84 v4.19.83 v4.19.82 v4.19.81 v4.19.80 v4.19.79 v4.19.78 v4.19.77 v4.19.76 v4.19.75 v4.19.74 v4.19.73 v4.19.72 v4.19.71 v4.19.70 v4.19.69 v4.19.68 v4.19.67 v4.19.66 v4.19.65 v4.19.64 v4.19.63 v4.19.62 v4.19.61 v4.19.60 v4.19.59 v4.19.58 v4.19.57 v4.19.56 v4.19.55 v4.19.54 v4.19.53 v4.19.52 v4.19.51 v4.19.50 v4.19.49 v4.19.48 v4.19.47 v4.19.46 v4.19.45 v4.19.44 v4.19.43 v4.19.42 v4.19.41 v4.19.40 v4.19.39 v4.19.38 v4.19.37 v4.19.36 v4.19.35 v4.19.34 v4.19.33 v4.19.32 v4.19.31 v4.19.30 v4.19.29 v4.19.28 v4.19.27 v4.19.26 v4.19.25 v4.19.24 v4.19.23 v4.19.22 v4.19.21 v4.19.20 v4.19.19 v4.19.18 v4.19.17 v4.19.16 v4.19.15 v4.19.14 v4.19.13 v4.19.12 v4.19.11 v4.19.10 v4.19.9 v4.19.8 v4.19.7 v4.19.6 v4.19.5 v4.19.4 v4.19.3 v4.19.2 v4.19.1 v4.19 v4.19-rc8 v4.19-rc7 v4.19-rc6 v4.19-rc5 v4.19-rc4 v4.19-rc3 v4.19-rc2 v4.19-rc1 ck-release-21 ck-release-20 ck-release-19.2 ck-release-19.1 ck-release-19 ck-release-18 ck-release-17.2 ck-release-17.1 ck-release-17 ck-release-16 ck-release-15.1 ck-release-15 ck-release-14 ck-release-13.2 ck-release-13 ck-release-12 ck-release-11 ck-release-10 ck-release-9 ck-release-7 alk-release-15 alk-release-14 alk-release-13.2 alk-release-13 alk-release-12 alk-release-11 alk-release-10 alk-release-9 alk-release-7
无相关合并请求
...@@ -28,6 +28,7 @@ ...@@ -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) ...@@ -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) ...@@ -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, ...@@ -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:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册
反馈
建议
客服 返回
顶部