android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MIPS] RTLX: Don't use volatile; it's fragile.

Browse Source 
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Ralf Baechle
2007-03-15 17:08:28 +00:00
parent 080e948c07
commit 9e34682026
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/mips/kernel/rtlx.c
View File

@ -146,7 +146,7 @@ static void stopping(int vpe)
int rtlx_open(int index, int can_sleep) int rtlx_open(int index, int can_sleep)
{ {
volatile struct rtlx_info **p; struct rtlx_info **p;
struct rtlx_channel *chan; struct rtlx_channel *chan;
enum rtlx_state state; enum rtlx_state state;
int ret = 0; int ret = 0;
@ -179,13 +179,24 @@ int rtlx_open(int index, int can_sleep)
} }
} }
smp_rmb();
if (*p == NULL) { if (*p == NULL) {
if (can_sleep) { if (can_sleep) {
__wait_event_interruptible(channel_wqs[index].lx_queue, DEFINE_WAIT(wait);
*p != NULL,
ret); for (;;) {
if (ret) prepare_to_wait(&channel_wqs[index].lx_queue, &wait, TASK_INTERRUPTIBLE);
smp_rmb();
if (*p != NULL)
break;
if (!signal_pending(current)) {
schedule();
continue;
}
ret = -ERESTARTSYS;
goto out_fail; goto out_fail;
}
finish_wait(&channel_wqs[index].lx_queue, &wait);
} else { } else {
printk(" *vpe_get_shared is NULL. " printk(" *vpe_get_shared is NULL. "
"Has an SP program been loaded?\n"); "Has an SP program been loaded?\n");