gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

delete old? ioctl(2) delegation codes

Browse Source
This commit is contained in:
NAKAMURA Gou
2013-06-07 21:20:29 +09:00
parent 08b881b530
commit 5206ae7d57
2 changed files with 0 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
executer/user/mcexec.c
View File

@ -674,20 +674,6 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock)
w.sr.args[1], sizeof(struct stat)); w.sr.args[1], sizeof(struct stat));
break; break;
case __NR_ioctl:
if (w.sr.args[1] == TCGETS) {
ret = ioctl(w.sr.args[0], w.sr.args[1],
(unsigned long)dma_buf);
if (ret == -1) {
ret = -errno;
}
do_syscall_return(fd, cpu, ret, 1, (unsigned long)dma_buf,
w.sr.args[2],
sizeof(struct kernel_termios)
);
}
break;
/* /*
glibc-2.14.90/sysdeps/unix/sysv/linux/x86_64/time.S glibc-2.14.90/sysdeps/unix/sysv/linux/x86_64/time.S
linux-2.6.34.13/arch/x86/kernel/vsyscall_64.c linux-2.6.34.13/arch/x86/kernel/vsyscall_64.c

68
kernel/syscall.c
View File

@ -227,73 +227,6 @@ SYSCALL_DECLARE(gettimeofday)
SYSCALL_FOOTER; SYSCALL_FOOTER;
} }
static DECLARE_WAITQ(my_waitq);
SYSCALL_DECLARE(ioctl)
{
switch (ihk_mc_syscall_arg0(ctx)) {
case 0: {
struct waitq_entry my_wait;
waitq_init_entry(&my_wait, cpu_local_var(current));
dkprintf("CPU[%d] pid[%d] going to sleep...\n",
cpu_local_var(current)->cpu_id,
cpu_local_var(current)->pid);
waitq_prepare_to_wait(&my_waitq, &my_wait, PS_INTERRUPTIBLE);
schedule();
waitq_finish_wait(&my_waitq, &my_wait);
dkprintf("CPU[%d] pid[%d] woke up!\n",
cpu_local_var(current)->cpu_id,
cpu_local_var(current)->pid);
break;
}
case 1:
dkprintf("CPU[%d] pid[%d] waking up everyone..\n",
cpu_local_var(current)->cpu_id,
cpu_local_var(current)->pid);
waitq_wakeup(&my_waitq);
break;
case 2:
dkprintf("[%d] pid %d made an ioctl\n",
cpu_local_var(current)->cpu_id,
cpu_local_var(current)->pid);
break;
default:
dkprintf("ioctl() unimplemented\n");
}
return 0;
#if 0
SYSCALL_HEADER;
/* Very ad-hoc for termios */
switch(ihk_mc_syscall_arg1(ctx)) {
case 0x5401:
SYSCALL_ARGS_3(D, D, MO);
SYSCALL_FOOTER;
}
return -EINVAL;
#endif
}
SYSCALL_DECLARE(read) SYSCALL_DECLARE(read)
{ {
SYSCALL_HEADER; SYSCALL_HEADER;
@ -1164,7 +1097,6 @@ static long (*syscall_table[])(int, ihk_mc_user_context_t *) = {
[12] = sys_brk, [12] = sys_brk,
[13] = sys_rt_sigaction, [13] = sys_rt_sigaction,
[14] = sys_rt_sigprocmask, [14] = sys_rt_sigprocmask,
[16] = sys_ioctl,
[17] = sys_pread, [17] = sys_pread,
[18] = sys_pwrite, [18] = sys_pwrite,
[20] = sys_writev, [20] = sys_writev,