From 5206ae7d57acc1e711402da875d206e1a6eb6dd4 Mon Sep 17 00:00:00 2001 From: NAKAMURA Gou Date: Fri, 7 Jun 2013 21:20:29 +0900 Subject: [PATCH] delete old? ioctl(2) delegation codes --- executer/user/mcexec.c | 14 --------- kernel/syscall.c | 68 ------------------------------------------ 2 files changed, 82 deletions(-) diff --git a/executer/user/mcexec.c b/executer/user/mcexec.c index b719ab0c..445285f7 100644 --- a/executer/user/mcexec.c +++ b/executer/user/mcexec.c @@ -674,20 +674,6 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock) w.sr.args[1], sizeof(struct stat)); 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 linux-2.6.34.13/arch/x86/kernel/vsyscall_64.c diff --git a/kernel/syscall.c b/kernel/syscall.c index 8ac1bb64..ea1f2b5d 100644 --- a/kernel/syscall.c +++ b/kernel/syscall.c @@ -227,73 +227,6 @@ SYSCALL_DECLARE(gettimeofday) 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_HEADER; @@ -1164,7 +1097,6 @@ static long (*syscall_table[])(int, ihk_mc_user_context_t *) = { [12] = sys_brk, [13] = sys_rt_sigaction, [14] = sys_rt_sigprocmask, - [16] = sys_ioctl, [17] = sys_pread, [18] = sys_pwrite, [20] = sys_writev,