From 3862a24d206d2c9455315e0e3a1f7d2ce8e26f78 Mon Sep 17 00:00:00 2001 From: nathanw Date: Wed, 14 Feb 2001 01:29:45 +0000 Subject: [PATCH] Remove prototype for long-defunct i386_user_cleanup(). Remove duplicate prototype for i386_{set,get}_ldt() from sys_machdep.c. Change i386_iopl() and i386_{set,get}_{ldt,ioperm}() to take a second argument of "void *" instead of "char *", for consistency with other syscalls. --- sys/arch/i386/i386/sys_machdep.c | 22 +++++++++------------- sys/arch/i386/include/cpu.h | 7 +++---- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/sys/arch/i386/i386/sys_machdep.c b/sys/arch/i386/i386/sys_machdep.c index e9cc05693b8d..62e4e0440319 100644 --- a/sys/arch/i386/i386/sys_machdep.c +++ b/sys/arch/i386/i386/sys_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: sys_machdep.c,v 1.55 2001/01/16 23:32:21 sommerfeld Exp $ */ +/* $NetBSD: sys_machdep.c,v 1.56 2001/02/14 01:29:46 nathanw Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -74,19 +74,15 @@ extern vm_map_t kernel_map; -#ifdef USER_LDT -int i386_get_ldt __P((struct proc *, char *, register_t *)); -int i386_set_ldt __P((struct proc *, char *, register_t *)); -#endif -int i386_iopl __P((struct proc *, char *, register_t *)); -int i386_get_ioperm __P((struct proc *, char *, register_t *)); -int i386_set_ioperm __P((struct proc *, char *, register_t *)); +int i386_iopl __P((struct proc *, void *, register_t *)); +int i386_get_ioperm __P((struct proc *, void *, register_t *)); +int i386_set_ioperm __P((struct proc *, void *, register_t *)); #ifdef USER_LDT int i386_get_ldt(p, args, retval) struct proc *p; - char *args; + void *args; register_t *retval; { int error; @@ -135,7 +131,7 @@ i386_get_ldt(p, args, retval) int i386_set_ldt(p, args, retval) struct proc *p; - char *args; + void *args; register_t *retval; { int error, i, n; @@ -294,7 +290,7 @@ out: int i386_iopl(p, args, retval) struct proc *p; - char *args; + void *args; register_t *retval; { int error; @@ -321,7 +317,7 @@ i386_iopl(p, args, retval) int i386_get_ioperm(p, args, retval) struct proc *p; - char *args; + void *args; register_t *retval; { int error; @@ -337,7 +333,7 @@ i386_get_ioperm(p, args, retval) int i386_set_ioperm(p, args, retval) struct proc *p; - char *args; + void *args; register_t *retval; { int error; diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h index 9294abb50ff2..ae20f6043e35 100644 --- a/sys/arch/i386/include/cpu.h +++ b/sys/arch/i386/include/cpu.h @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.67 2000/12/10 19:29:31 mycroft Exp $ */ +/* $NetBSD: cpu.h,v 1.68 2001/02/14 01:29:45 nathanw Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -198,9 +198,8 @@ int math_emulate __P((struct trapframe *)); #endif #ifdef USER_LDT /* sys_machdep.h */ -void i386_user_cleanup __P((struct pcb *)); -int i386_get_ldt __P((struct proc *, char *, register_t *)); -int i386_set_ldt __P((struct proc *, char *, register_t *)); +int i386_get_ldt __P((struct proc *, void *, register_t *)); +int i386_set_ldt __P((struct proc *, void *, register_t *)); #endif /* isa_machdep.c */