FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-19 15:39:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[MIPS] Fix AP/SP to work in the reality of modern kernels.

Browse Source 
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Ralf Baechle 2007-04-25 15:08:57 +01:00
parent de46c33745
commit 7f5a7716dc
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/mips/kernel/kspd.c
View File

@ -17,6 +17,7 @@
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/sched.h>
#include <linux/unistd.h> #include <linux/unistd.h>
#include <linux/file.h> #include <linux/file.h>
#include <linux/fs.h> #include <linux/fs.h>
@ -198,7 +199,6 @@ void sp_work_handle_request(void)
int cmd; int cmd;
char *vcwd; char *vcwd;
mm_segment_t old_fs;
int size; int size;
ret.retval = -1; ret.retval = -1;
@ -241,8 +241,6 @@ void sp_work_handle_request(void)
if ((ret.retval = sp_syscall(__NR_gettimeofday, (int)&tv, if ((ret.retval = sp_syscall(__NR_gettimeofday, (int)&tv,
(int)&tz, 0,0)) == 0) (int)&tz, 0,0)) == 0)
ret.retval = tv.tv_sec; ret.retval = tv.tv_sec;
ret.errno = errno;
break; break;
case MTSP_SYSCALL_EXIT: case MTSP_SYSCALL_EXIT:
@ -279,7 +277,6 @@ void sp_work_handle_request(void)
if (cmd >= 0) { if (cmd >= 0) {
ret.retval = sp_syscall(cmd, generic.arg0, generic.arg1, ret.retval = sp_syscall(cmd, generic.arg0, generic.arg1,
generic.arg2, generic.arg3); generic.arg2, generic.arg3);
ret.errno = errno;
} else } else
printk(KERN_WARNING printk(KERN_WARNING
"KSPD: Unknown SP syscall number %d\n", sc.cmd); "KSPD: Unknown SP syscall number %d\n", sc.cmd);

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

@ -289,7 +289,7 @@ unsigned int rtlx_write_poll(int index)
return write_spacefree(chan->rt_read, chan->rt_write, chan->buffer_size); return write_spacefree(chan->rt_read, chan->rt_write, chan->buffer_size);
} }
ssize_t rtlx_read(int index, void __user *buff, size_t count, int user) ssize_t rtlx_read(int index, void __user *buff, size_t count)
{ {
size_t lx_write, fl = 0L; size_t lx_write, fl = 0L;
struct rtlx_channel *lx; struct rtlx_channel *lx;
@ -331,9 +331,10 @@ out:
return count; return count;
} }
ssize_t rtlx_write(int index, const void __user *buffer, size_t count, int user) ssize_t rtlx_write(int index, const void __user *buffer, size_t count)
{ {
struct rtlx_channel *rt; struct rtlx_channel *rt;
unsigned long failed;
size_t rt_read; size_t rt_read;
size_t fl; size_t fl;
@ -363,7 +364,7 @@ ssize_t rtlx_write(int index, const void __user *buffer, size_t count, int user)
} }
out: out:
count -= cailed; count -= failed;
smp_wmb(); smp_wmb();
rt->rt_write = (rt->rt_write + count) % rt->buffer_size; rt->rt_write = (rt->rt_write + count) % rt->buffer_size;