Remove __P.

37 files changed, 351 insertions, 353 deletions

diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c
index 9749e0c..a32a77b 100644
--- a/sys/i386/apm/apm.c
+++ b/sys/i386/apm/apm.c
@@ -48,12 +48,12 @@
 #include <i386/apm/apm.h>
 
 /* Used by the apm_saver screen saver module */
-int apm_display __P((int newstate));
+int apm_display(int newstate);
 struct apm_softc apm_softc;
 
-static void apm_resume __P((void));
+static void apm_resume(void);
 static int apm_bioscall(void);
-static int apm_check_function_supported __P((u_int version, u_int func));
+static int apm_check_function_supported(u_int version, u_int func);
 
 static int apm_pm_func(u_long, void*, ...);
 
@@ -404,7 +404,7 @@ apm_hook_disestablish(int apmh, struct apmhook *ah)
 	apm_del_hook(&hook[apmh], ah);
 }
 
-static int apm_record_event __P((struct apm_softc *, u_int));
+static int apm_record_event(struct apm_softc *, u_int);
 static void apm_processevent(void);
 
 static u_int apm_op_inprog = 0;
diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c
index 9749e0c..a32a77b 100644
--- a/sys/i386/bios/apm.c
+++ b/sys/i386/bios/apm.c
@@ -48,12 +48,12 @@
 #include <i386/apm/apm.h>
 
 /* Used by the apm_saver screen saver module */
-int apm_display __P((int newstate));
+int apm_display(int newstate);
 struct apm_softc apm_softc;
 
-static void apm_resume __P((void));
+static void apm_resume(void);
 static int apm_bioscall(void);
-static int apm_check_function_supported __P((u_int version, u_int func));
+static int apm_check_function_supported(u_int version, u_int func);
 
 static int apm_pm_func(u_long, void*, ...);
 
@@ -404,7 +404,7 @@ apm_hook_disestablish(int apmh, struct apmhook *ah)
 	apm_del_hook(&hook[apmh], ah);
 }
 
-static int apm_record_event __P((struct apm_softc *, u_int));
+static int apm_record_event(struct apm_softc *, u_int);
 static void apm_processevent(void);
 
 static u_int apm_op_inprog = 0;
diff --git a/sys/i386/ibcs2/ibcs2_fcntl.c b/sys/i386/ibcs2/ibcs2_fcntl.c
index 07b7f41..1a2a22a 100644
--- a/sys/i386/ibcs2/ibcs2_fcntl.c
+++ b/sys/i386/ibcs2/ibcs2_fcntl.c
@@ -44,11 +44,11 @@
 #include <i386/ibcs2/ibcs2_proto.h>
 #include <i386/ibcs2/ibcs2_util.h>
 
-static void cvt_iflock2flock __P((struct ibcs2_flock *, struct flock *));
-static void cvt_flock2iflock __P((struct flock *, struct ibcs2_flock *));
-static int  cvt_o_flags      __P((int));
-static int  oflags2ioflags   __P((int));
-static int  ioflags2oflags   __P((int));
+static void cvt_iflock2flock(struct ibcs2_flock *, struct flock *);
+static void cvt_flock2iflock(struct flock *, struct ibcs2_flock *);
+static int  cvt_o_flags(int);
+static int  oflags2ioflags(int);
+static int  ioflags2oflags(int);
 
 static int
 cvt_o_flags(flags)
diff --git a/sys/i386/ibcs2/ibcs2_ioctl.c b/sys/i386/ibcs2/ibcs2_ioctl.c
index 3c3d36a..b192b61 100644
--- a/sys/i386/ibcs2/ibcs2_ioctl.c
+++ b/sys/i386/ibcs2/ibcs2_ioctl.c
@@ -50,10 +50,10 @@
 #include <i386/ibcs2/ibcs2_util.h>
 #include <i386/ibcs2/ibcs2_ioctl.h>
 
-static void stios2btios __P((struct ibcs2_termios *, struct termios *));
-static void btios2stios __P((struct termios *, struct ibcs2_termios *));
-static void stios2stio  __P((struct ibcs2_termios *, struct ibcs2_termio *));
-static void stio2stios  __P((struct ibcs2_termio *, struct ibcs2_termios *));
+static void stios2btios(struct ibcs2_termios *, struct termios *);
+static void btios2stios(struct termios *, struct ibcs2_termios *);
+static void stios2stio(struct ibcs2_termios *, struct ibcs2_termio *);
+static void stio2stios(struct ibcs2_termio *, struct ibcs2_termios *);
 
 
 int
diff --git a/sys/i386/ibcs2/ibcs2_ipc.c b/sys/i386/ibcs2/ibcs2_ipc.c
index 804f82d..cdf8e87 100644
--- a/sys/i386/ibcs2/ibcs2_ipc.c
+++ b/sys/i386/ibcs2/ibcs2_ipc.c
@@ -45,18 +45,18 @@
 
 
 
-static void cvt_msqid2imsqid __P((struct msqid_ds *, struct ibcs2_msqid_ds *));
-static void cvt_imsqid2msqid __P((struct ibcs2_msqid_ds *, struct msqid_ds *));
+static void cvt_msqid2imsqid(struct msqid_ds *, struct ibcs2_msqid_ds *);
+static void cvt_imsqid2msqid(struct ibcs2_msqid_ds *, struct msqid_ds *);
 #ifdef unused
-static void cvt_sem2isem     __P((struct sem *, struct ibcs2_sem *));
-static void cvt_isem2sem     __P((struct ibcs2_sem *, struct sem *));
+static void cvt_sem2isem(struct sem *, struct ibcs2_sem *);
+static void cvt_isem2sem(struct ibcs2_sem *, struct sem *);
 #endif
-static void cvt_semid2isemid __P((struct semid_ds *, struct ibcs2_semid_ds *));
-static void cvt_isemid2semid __P((struct ibcs2_semid_ds *, struct semid_ds *));
-static void cvt_shmid2ishmid __P((struct shmid_ds *, struct ibcs2_shmid_ds *));
-static void cvt_ishmid2shmid __P((struct ibcs2_shmid_ds *, struct shmid_ds *));
-static void cvt_perm2iperm   __P((struct ipc_perm *, struct ibcs2_ipc_perm *));
-static void cvt_iperm2perm   __P((struct ibcs2_ipc_perm *, struct ipc_perm *));
+static void cvt_semid2isemid(struct semid_ds *, struct ibcs2_semid_ds *);
+static void cvt_isemid2semid(struct ibcs2_semid_ds *, struct semid_ds *);
+static void cvt_shmid2ishmid(struct shmid_ds *, struct ibcs2_shmid_ds *);
+static void cvt_ishmid2shmid(struct ibcs2_shmid_ds *, struct shmid_ds *);
+static void cvt_perm2iperm(struct ipc_perm *, struct ibcs2_ipc_perm *);
+static void cvt_iperm2perm(struct ibcs2_ipc_perm *, struct ipc_perm *);
 
 
 /*
diff --git a/sys/i386/ibcs2/ibcs2_proto.h b/sys/i386/ibcs2/ibcs2_proto.h
index c7ac3df..9e49af1 100644
--- a/sys/i386/ibcs2/ibcs2_proto.h
+++ b/sys/i386/ibcs2/ibcs2_proto.h
@@ -275,62 +275,62 @@ struct	ibcs2_readlink_args {
 struct	ibcs2_isc_args {
 	register_t dummy;
 };
-int	ibcs2_read __P((struct thread *, struct ibcs2_read_args *));
-int	ibcs2_open __P((struct thread *, struct ibcs2_open_args *));
-int	ibcs2_wait __P((struct thread *, struct ibcs2_wait_args *));
-int	ibcs2_creat __P((struct thread *, struct ibcs2_creat_args *));
-int	ibcs2_unlink __P((struct thread *, struct ibcs2_unlink_args *));
-int	ibcs2_execv __P((struct thread *, struct ibcs2_execv_args *));
-int	ibcs2_chdir __P((struct thread *, struct ibcs2_chdir_args *));
-int	ibcs2_time __P((struct thread *, struct ibcs2_time_args *));
-int	ibcs2_mknod __P((struct thread *, struct ibcs2_mknod_args *));
-int	ibcs2_chmod __P((struct thread *, struct ibcs2_chmod_args *));
-int	ibcs2_chown __P((struct thread *, struct ibcs2_chown_args *));
-int	ibcs2_stat __P((struct thread *, struct ibcs2_stat_args *));
-int	ibcs2_lseek __P((struct thread *, struct ibcs2_lseek_args *));
-int	ibcs2_mount __P((struct thread *, struct ibcs2_mount_args *));
-int	ibcs2_umount __P((struct thread *, struct ibcs2_umount_args *));
-int	ibcs2_setuid __P((struct thread *, struct ibcs2_setuid_args *));
-int	ibcs2_stime __P((struct thread *, struct ibcs2_stime_args *));
-int	ibcs2_alarm __P((struct thread *, struct ibcs2_alarm_args *));
-int	ibcs2_fstat __P((struct thread *, struct ibcs2_fstat_args *));
-int	ibcs2_pause __P((struct thread *, struct ibcs2_pause_args *));
-int	ibcs2_utime __P((struct thread *, struct ibcs2_utime_args *));
-int	ibcs2_stty __P((struct thread *, struct ibcs2_stty_args *));
-int	ibcs2_gtty __P((struct thread *, struct ibcs2_gtty_args *));
-int	ibcs2_access __P((struct thread *, struct ibcs2_access_args *));
-int	ibcs2_nice __P((struct thread *, struct ibcs2_nice_args *));
-int	ibcs2_statfs __P((struct thread *, struct ibcs2_statfs_args *));
-int	ibcs2_kill __P((struct thread *, struct ibcs2_kill_args *));
-int	ibcs2_fstatfs __P((struct thread *, struct ibcs2_fstatfs_args *));
-int	ibcs2_pgrpsys __P((struct thread *, struct ibcs2_pgrpsys_args *));
-int	ibcs2_xenix __P((struct thread *, struct ibcs2_xenix_args *));
-int	ibcs2_times __P((struct thread *, struct ibcs2_times_args *));
-int	ibcs2_plock __P((struct thread *, struct ibcs2_plock_args *));
-int	ibcs2_setgid __P((struct thread *, struct ibcs2_setgid_args *));
-int	ibcs2_sigsys __P((struct thread *, struct ibcs2_sigsys_args *));
-int	ibcs2_msgsys __P((struct thread *, struct ibcs2_msgsys_args *));
-int	ibcs2_sysi86 __P((struct thread *, struct ibcs2_sysi86_args *));
-int	ibcs2_shmsys __P((struct thread *, struct ibcs2_shmsys_args *));
-int	ibcs2_semsys __P((struct thread *, struct ibcs2_semsys_args *));
-int	ibcs2_ioctl __P((struct thread *, struct ibcs2_ioctl_args *));
-int	ibcs2_uadmin __P((struct thread *, struct ibcs2_uadmin_args *));
-int	ibcs2_utssys __P((struct thread *, struct ibcs2_utssys_args *));
-int	ibcs2_execve __P((struct thread *, struct ibcs2_execve_args *));
-int	ibcs2_fcntl __P((struct thread *, struct ibcs2_fcntl_args *));
-int	ibcs2_ulimit __P((struct thread *, struct ibcs2_ulimit_args *));
-int	ibcs2_rmdir __P((struct thread *, struct ibcs2_rmdir_args *));
-int	ibcs2_mkdir __P((struct thread *, struct ibcs2_mkdir_args *));
-int	ibcs2_getdents __P((struct thread *, struct ibcs2_getdents_args *));
-int	ibcs2_sysfs __P((struct thread *, struct ibcs2_sysfs_args *));
-int	ibcs2_getmsg __P((struct thread *, struct ibcs2_getmsg_args *));
-int	ibcs2_putmsg __P((struct thread *, struct ibcs2_putmsg_args *));
-int	ibcs2_poll __P((struct thread *, struct ibcs2_poll_args *));
-int	ibcs2_secure __P((struct thread *, struct ibcs2_secure_args *));
-int	ibcs2_symlink __P((struct thread *, struct ibcs2_symlink_args *));
-int	ibcs2_lstat __P((struct thread *, struct ibcs2_lstat_args *));
-int	ibcs2_readlink __P((struct thread *, struct ibcs2_readlink_args *));
-int	ibcs2_isc __P((struct thread *, struct ibcs2_isc_args *));
+int	ibcs2_read(struct thread *, struct ibcs2_read_args *);
+int	ibcs2_open(struct thread *, struct ibcs2_open_args *);
+int	ibcs2_wait(struct thread *, struct ibcs2_wait_args *);
+int	ibcs2_creat(struct thread *, struct ibcs2_creat_args *);
+int	ibcs2_unlink(struct thread *, struct ibcs2_unlink_args *);
+int	ibcs2_execv(struct thread *, struct ibcs2_execv_args *);
+int	ibcs2_chdir(struct thread *, struct ibcs2_chdir_args *);
+int	ibcs2_time(struct thread *, struct ibcs2_time_args *);
+int	ibcs2_mknod(struct thread *, struct ibcs2_mknod_args *);
+int	ibcs2_chmod(struct thread *, struct ibcs2_chmod_args *);
+int	ibcs2_chown(struct thread *, struct ibcs2_chown_args *);
+int	ibcs2_stat(struct thread *, struct ibcs2_stat_args *);
+int	ibcs2_lseek(struct thread *, struct ibcs2_lseek_args *);
+int	ibcs2_mount(struct thread *, struct ibcs2_mount_args *);
+int	ibcs2_umount(struct thread *, struct ibcs2_umount_args *);
+int	ibcs2_setuid(struct thread *, struct ibcs2_setuid_args *);
+int	ibcs2_stime(struct thread *, struct ibcs2_stime_args *);
+int	ibcs2_alarm(struct thread *, struct ibcs2_alarm_args *);
+int	ibcs2_fstat(struct thread *, struct ibcs2_fstat_args *);
+int	ibcs2_pause(struct thread *, struct ibcs2_pause_args *);
+int	ibcs2_utime(struct thread *, struct ibcs2_utime_args *);
+int	ibcs2_stty(struct thread *, struct ibcs2_stty_args *);
+int	ibcs2_gtty(struct thread *, struct ibcs2_gtty_args *);
+int	ibcs2_access(struct thread *, struct ibcs2_access_args *);
+int	ibcs2_nice(struct thread *, struct ibcs2_nice_args *);
+int	ibcs2_statfs(struct thread *, struct ibcs2_statfs_args *);
+int	ibcs2_kill(struct thread *, struct ibcs2_kill_args *);
+int	ibcs2_fstatfs(struct thread *, struct ibcs2_fstatfs_args *);
+int	ibcs2_pgrpsys(struct thread *, struct ibcs2_pgrpsys_args *);
+int	ibcs2_xenix(struct thread *, struct ibcs2_xenix_args *);
+int	ibcs2_times(struct thread *, struct ibcs2_times_args *);
+int	ibcs2_plock(struct thread *, struct ibcs2_plock_args *);
+int	ibcs2_setgid(struct thread *, struct ibcs2_setgid_args *);
+int	ibcs2_sigsys(struct thread *, struct ibcs2_sigsys_args *);
+int	ibcs2_msgsys(struct thread *, struct ibcs2_msgsys_args *);
+int	ibcs2_sysi86(struct thread *, struct ibcs2_sysi86_args *);
+int	ibcs2_shmsys(struct thread *, struct ibcs2_shmsys_args *);
+int	ibcs2_semsys(struct thread *, struct ibcs2_semsys_args *);
+int	ibcs2_ioctl(struct thread *, struct ibcs2_ioctl_args *);
+int	ibcs2_uadmin(struct thread *, struct ibcs2_uadmin_args *);
+int	ibcs2_utssys(struct thread *, struct ibcs2_utssys_args *);
+int	ibcs2_execve(struct thread *, struct ibcs2_execve_args *);
+int	ibcs2_fcntl(struct thread *, struct ibcs2_fcntl_args *);
+int	ibcs2_ulimit(struct thread *, struct ibcs2_ulimit_args *);
+int	ibcs2_rmdir(struct thread *, struct ibcs2_rmdir_args *);
+int	ibcs2_mkdir(struct thread *, struct ibcs2_mkdir_args *);
+int	ibcs2_getdents(struct thread *, struct ibcs2_getdents_args *);
+int	ibcs2_sysfs(struct thread *, struct ibcs2_sysfs_args *);
+int	ibcs2_getmsg(struct thread *, struct ibcs2_getmsg_args *);
+int	ibcs2_putmsg(struct thread *, struct ibcs2_putmsg_args *);
+int	ibcs2_poll(struct thread *, struct ibcs2_poll_args *);
+int	ibcs2_secure(struct thread *, struct ibcs2_secure_args *);
+int	ibcs2_symlink(struct thread *, struct ibcs2_symlink_args *);
+int	ibcs2_lstat(struct thread *, struct ibcs2_lstat_args *);
+int	ibcs2_readlink(struct thread *, struct ibcs2_readlink_args *);
+int	ibcs2_isc(struct thread *, struct ibcs2_isc_args *);
 
 #ifdef COMPAT_43
 
diff --git a/sys/i386/ibcs2/ibcs2_signal.c b/sys/i386/ibcs2/ibcs2_signal.c
index 197c295..fd32aaf 100644
--- a/sys/i386/ibcs2/ibcs2_signal.c
+++ b/sys/i386/ibcs2/ibcs2_signal.c
@@ -50,12 +50,12 @@
 #define ibcs2_sigismember(s, n)	(*(s) & ibcs2_sigmask(n))
 #define ibcs2_sigaddset(s, n)	(*(s) |= ibcs2_sigmask(n))
 
-static void ibcs2_to_bsd_sigset    __P((const ibcs2_sigset_t *, sigset_t *));
-static void bsd_to_ibcs2_sigset    __P((const sigset_t *, ibcs2_sigset_t *));
-static void ibcs2_to_bsd_sigaction __P((struct ibcs2_sigaction *,
-					struct sigaction *));
-static void bsd_to_ibcs2_sigaction __P((struct sigaction *,
-					struct ibcs2_sigaction *));
+static void ibcs2_to_bsd_sigset(const ibcs2_sigset_t *, sigset_t *);
+static void bsd_to_ibcs2_sigset(const sigset_t *, ibcs2_sigset_t *);
+static void ibcs2_to_bsd_sigaction(struct ibcs2_sigaction *,
+					struct sigaction *);
+static void bsd_to_ibcs2_sigaction(struct sigaction *,
+					struct ibcs2_sigaction *);
 
 int bsd_to_ibcs2_sig[IBCS2_SIGTBLSZ] = {
 	IBCS2_SIGHUP,		/* 1 */
diff --git a/sys/i386/ibcs2/ibcs2_signal.h b/sys/i386/ibcs2/ibcs2_signal.h
index 21df087..eda9adf 100644
--- a/sys/i386/ibcs2/ibcs2_signal.h
+++ b/sys/i386/ibcs2/ibcs2_signal.h
@@ -83,7 +83,7 @@
 #define IBCS2_SIGCALL(x)	((x) & ~IBCS2_SIGNO_MASK)
 
 typedef long	ibcs2_sigset_t;
-typedef void	(*ibcs2_sig_t) __P((int));
+typedef void	(*ibcs2_sig_t)(int);
 
 struct ibcs2_sigaction {
 	ibcs2_sig_t	isa_handler;
diff --git a/sys/i386/ibcs2/ibcs2_socksys.c b/sys/i386/ibcs2/ibcs2_socksys.c
index ebe6a50..0bd14d6 100644
--- a/sys/i386/ibcs2/ibcs2_socksys.c
+++ b/sys/i386/ibcs2/ibcs2_socksys.c
@@ -47,10 +47,10 @@ struct setipdomainname_args {
 };
 
 /* Local prototypes */
-static int ibcs2_getipdomainname __P((struct thread *,
-				      struct getipdomainname_args *));
-static int ibcs2_setipdomainname __P((struct thread *,
-				      struct setipdomainname_args *));
+static int ibcs2_getipdomainname(struct thread *,
+				      struct getipdomainname_args *);
+static int ibcs2_setipdomainname(struct thread *,
+				      struct setipdomainname_args *);
 
 /*
  * iBCS2 socksys calls.
diff --git a/sys/i386/ibcs2/ibcs2_socksys.h b/sys/i386/ibcs2/ibcs2_socksys.h
index f0c72bd..9a22a7b 100644
--- a/sys/i386/ibcs2/ibcs2_socksys.h
+++ b/sys/i386/ibcs2/ibcs2_socksys.h
@@ -123,6 +123,6 @@ struct ibcs2_socksys_args {
 	caddr_t argsp;
 };
 
-int ibcs2_socksys __P((struct thread *, struct ibcs2_socksys_args *));
+int ibcs2_socksys(struct thread *, struct ibcs2_socksys_args *);
 
 #endif /* !_I386_IBCS2_IBCS2_SOCKSYS_H_ */
diff --git a/sys/i386/ibcs2/ibcs2_stat.c b/sys/i386/ibcs2/ibcs2_stat.c
index 3940899..062a5b5 100644
--- a/sys/i386/ibcs2/ibcs2_stat.c
+++ b/sys/i386/ibcs2/ibcs2_stat.c
@@ -49,8 +49,8 @@
 #include <i386/ibcs2/ibcs2_utsname.h>
 
 
-static void bsd_stat2ibcs_stat __P((struct stat *, struct ibcs2_stat *));
-static int  cvt_statfs         __P((struct statfs *, caddr_t, int));
+static void bsd_stat2ibcs_stat(struct stat *, struct ibcs2_stat *);
+static int  cvt_statfs(struct statfs *, caddr_t, int);
 
 static void
 bsd_stat2ibcs_stat(st, st4)
diff --git a/sys/i386/ibcs2/ibcs2_util.h b/sys/i386/ibcs2/ibcs2_util.h
index 93382c4..a3b7357 100644
--- a/sys/i386/ibcs2/ibcs2_util.h
+++ b/sys/i386/ibcs2/ibcs2_util.h
@@ -84,8 +84,8 @@ stackgap_alloc(sgp, sz)
 
 extern const char ibcs2_emul_path[];
 
-int ibcs2_emul_find __P((struct thread *, caddr_t *, const char *, char *,
-			char **, int));
+int ibcs2_emul_find(struct thread *, caddr_t *, const char *, char *,
+			char **, int);
 
 #define CHECKALTEXIST(p, sgp, path) \
     ibcs2_emul_find(td, sgp, ibcs2_emul_path, path, &(path), 0)
@@ -94,7 +94,7 @@ int ibcs2_emul_find __P((struct thread *, caddr_t *, const char *, char *,
     ibcs2_emul_find(td, sgp, ibcs2_emul_path, path, &(path), 1)
 
 #ifdef SPX_HACK
-int spx_open __P((struct thread *td, void *uap));
+int spx_open(struct thread *td, void *uap);
 #endif
 
 #endif /* !_IBCS2_UTIL_H_ */
diff --git a/sys/i386/ibcs2/ibcs2_xenix.h b/sys/i386/ibcs2/ibcs2_xenix.h
index 07e827f..0c7521d 100644
--- a/sys/i386/ibcs2/ibcs2_xenix.h
+++ b/sys/i386/ibcs2/ibcs2_xenix.h
@@ -82,23 +82,23 @@ struct	ibcs2_rename_args {
 struct	xenix_utsname_args {
 	long	addr;	char addr_[PAD_(long)];
 };
-int	xenix_rdchk __P((struct thread *, struct xenix_rdchk_args *));
-int	xenix_chsize __P((struct thread *, struct xenix_chsize_args *));
-int	xenix_ftime __P((struct thread *, struct xenix_ftime_args *));
-int	xenix_nap __P((struct thread *, struct xenix_nap_args *));
-int	xenix_scoinfo __P((struct thread *, struct xenix_scoinfo_args *));
-int	xenix_eaccess __P((struct thread *, struct xenix_eaccess_args *));
-int	ibcs2_sigaction __P((struct thread *, struct ibcs2_sigaction_args *));
-int	ibcs2_sigprocmask __P((struct thread *, struct ibcs2_sigprocmask_args *));
-int	ibcs2_sigpending __P((struct thread *, struct ibcs2_sigpending_args *));
-int	ibcs2_sigsuspend __P((struct thread *, struct ibcs2_sigsuspend_args *));
-int	ibcs2_getgroups __P((struct thread *, struct ibcs2_getgroups_args *));
-int	ibcs2_setgroups __P((struct thread *, struct ibcs2_setgroups_args *));
-int	ibcs2_sysconf __P((struct thread *, struct ibcs2_sysconf_args *));
-int	ibcs2_pathconf __P((struct thread *, struct ibcs2_pathconf_args *));
-int	ibcs2_fpathconf __P((struct thread *, struct ibcs2_fpathconf_args *));
-int	ibcs2_rename __P((struct thread *, struct ibcs2_rename_args *));
-int	xenix_utsname __P((struct thread *, struct xenix_utsname_args *));
+int	xenix_rdchk(struct thread *, struct xenix_rdchk_args *);
+int	xenix_chsize(struct thread *, struct xenix_chsize_args *);
+int	xenix_ftime(struct thread *, struct xenix_ftime_args *);
+int	xenix_nap(struct thread *, struct xenix_nap_args *);
+int	xenix_scoinfo(struct thread *, struct xenix_scoinfo_args *);
+int	xenix_eaccess(struct thread *, struct xenix_eaccess_args *);
+int	ibcs2_sigaction(struct thread *, struct ibcs2_sigaction_args *);
+int	ibcs2_sigprocmask(struct thread *, struct ibcs2_sigprocmask_args *);
+int	ibcs2_sigpending(struct thread *, struct ibcs2_sigpending_args *);
+int	ibcs2_sigsuspend(struct thread *, struct ibcs2_sigsuspend_args *);
+int	ibcs2_getgroups(struct thread *, struct ibcs2_getgroups_args *);
+int	ibcs2_setgroups(struct thread *, struct ibcs2_setgroups_args *);
+int	ibcs2_sysconf(struct thread *, struct ibcs2_sysconf_args *);
+int	ibcs2_pathconf(struct thread *, struct ibcs2_pathconf_args *);
+int	ibcs2_fpathconf(struct thread *, struct ibcs2_fpathconf_args *);
+int	ibcs2_rename(struct thread *, struct ibcs2_rename_args *);
+int	xenix_utsname(struct thread *, struct xenix_utsname_args *);
 
 #ifdef COMPAT_43
 
diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c
index fd89db4..6148b12 100644
--- a/sys/i386/ibcs2/imgact_coff.c
+++ b/sys/i386/ibcs2/imgact_coff.c
@@ -54,10 +54,10 @@ MODULE_DEPEND(coff, ibcs2, 1, 1, 1);
 
 extern struct sysentvec ibcs2_svr3_sysvec;
 
-static int coff_load_file __P((struct thread *td, char *name));
-static int exec_coff_imgact __P((struct image_params *imgp));
+static int coff_load_file(struct thread *td, char *name);
+static int exec_coff_imgact(struct image_params *imgp);
 
-static int load_coff_section __P((struct vmspace *vmspace, struct vnode *vp, vm_offset_t offset, caddr_t vmaddr, size_t memsz, size_t filsz, vm_prot_t prot));
+static int load_coff_section(struct vmspace *vmspace, struct vnode *vp, vm_offset_t offset, caddr_t vmaddr, size_t memsz, size_t filsz, vm_prot_t prot);
 
 static int
 load_coff_section(struct vmspace *vmspace, struct vnode *vp, vm_offset_t offset,
diff --git a/sys/i386/include/apm_bios.h b/sys/i386/include/apm_bios.h
index 52212fe..208d80b 100644
--- a/sys/i386/include/apm_bios.h
+++ b/sys/i386/include/apm_bios.h
@@ -144,7 +144,7 @@
 /* C definitions */
 struct apmhook {
 	struct apmhook	*ah_next;
-	int		(*ah_fun) __P((void *ah_arg));
+	int		(*ah_fun)(void *ah_arg);
 	void		*ah_arg;
 	const char	*ah_name;
 	int		ah_order;
diff --git a/sys/i386/include/bus_pc98.h b/sys/i386/include/bus_pc98.h
index 8aab781..b0d871f 100644
--- a/sys/i386/include/bus_pc98.h
+++ b/sys/i386/include/bus_pc98.h
@@ -75,7 +75,7 @@ struct resource;
 /*
  * bus space tag
  */
-#define	_PASCAL_CALL	__P((void))
+#define	_PASCAL_CALL	(void)
 
 #define	_BUS_SPACE_CALL_FUNCS_TAB(NAME,TYPE,BWN) \
 	NAME##_space_read_##BWN##, 				\
@@ -215,28 +215,28 @@ void i386_memio_free(bus_space_tag_t t, bus_space_handle_t bsh,
  */
 #define	_BUS_ACCESS_METHODS_PROTO(TYPE,BWN) \
 	static __inline TYPE bus_space_read_##BWN 			\
-	__P((bus_space_tag_t, bus_space_handle_t, bus_size_t offset));	\
+	(bus_space_tag_t, bus_space_handle_t, bus_size_t offset);	\
 	static __inline void bus_space_read_multi_##BWN			\
-	__P((bus_space_tag_t, bus_space_handle_t,			\
-	     bus_size_t, TYPE *, size_t));				\
+	(bus_space_tag_t, bus_space_handle_t,				\
+	     bus_size_t, TYPE *, size_t);				\
 	static __inline void bus_space_read_region_##BWN		\
-	__P((bus_space_tag_t, bus_space_handle_t,			\
-	     bus_size_t, TYPE *, size_t));				\
+	(bus_space_tag_t, bus_space_handle_t,				\
+	     bus_size_t, TYPE *, size_t);				\
 	static __inline void bus_space_write_##BWN			\
-	__P((bus_space_tag_t, bus_space_handle_t, bus_size_t, TYPE));	\
+	(bus_space_tag_t, bus_space_handle_t, bus_size_t, TYPE);	\
 	static __inline void bus_space_write_multi_##BWN		\
-	__P((bus_space_tag_t, bus_space_handle_t,			\
-	     bus_size_t, const TYPE *, size_t));			\
+	(bus_space_tag_t, bus_space_handle_t,				\
+	     bus_size_t, const TYPE *, size_t);				\
 	static __inline void bus_space_write_region_##BWN		\
-	__P((bus_space_tag_t, bus_space_handle_t,			\
-	     bus_size_t, const TYPE *, size_t));			\
+	(bus_space_tag_t, bus_space_handle_t,				\
+	     bus_size_t, const TYPE *, size_t);				\
 	static __inline void bus_space_set_multi_##BWN			\
-	__P((bus_space_tag_t, bus_space_handle_t, bus_size_t, TYPE, size_t));\
+	(bus_space_tag_t, bus_space_handle_t, bus_size_t, TYPE, size_t);\
 	static __inline void bus_space_set_region_##BWN			\
-	__P((bus_space_tag_t, bus_space_handle_t, bus_size_t, TYPE, size_t));\
+	(bus_space_tag_t, bus_space_handle_t, bus_size_t, TYPE, size_t);\
 	static __inline void bus_space_copy_region_##BWN		\
-	__P((bus_space_tag_t, bus_space_handle_t, bus_size_t,		\
-	     bus_space_handle_t, bus_size_t, size_t));
+	(bus_space_tag_t, bus_space_handle_t, bus_size_t,		\
+	     bus_space_handle_t, bus_size_t, size_t);
 
 _BUS_ACCESS_METHODS_PROTO(u_int8_t,1)
 _BUS_ACCESS_METHODS_PROTO(u_int16_t,2)
diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h
index 20bd09d..38179a6 100644
--- a/sys/i386/include/clock.h
+++ b/sys/i386/include/clock.h
@@ -31,19 +31,18 @@ extern int	apic_8254_intr;
  */
 struct clockframe;
 
-int	acquire_timer0 __P((int rate,
-			    void (*function)(struct clockframe *frame)));
-int	acquire_timer2 __P((int mode));
-int	release_timer0 __P((void));
-int	release_timer2 __P((void));
+int	acquire_timer0(int rate, void (*function)(struct clockframe *frame));
+int	acquire_timer2(int mode);
+int	release_timer0(void);
+int	release_timer2(void);
 #ifndef PC98
-int	rtcin __P((int val));
+int	rtcin(int val);
 #else
-int	acquire_timer1 __P((int mode));
-int	release_timer1 __P((void));
+int	acquire_timer1(int mode);
+int	release_timer1(void);
 #endif
-int	sysbeep __P((int pitch, int period));
-void	timer_restore __P((void));
+int	sysbeep(int pitch, int period);
+void	timer_restore(void);
 
 #endif /* _KERNEL */
 
diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h
index 10b9499..06c191b 100644
--- a/sys/i386/include/cpu.h
+++ b/sys/i386/include/cpu.h
@@ -90,7 +90,7 @@ extern char	btext[];
 extern char	etext[];
 extern u_int	tsc_present;
 
-void	fork_trampoline __P((void));
+void	fork_trampoline(void);
 
 /*
  * Return contents of in-cpu fast counter as a sort of "bogo-time"
diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h
index a28e9a7..02a24a3 100644
--- a/sys/i386/include/cpufunc.h
+++ b/sys/i386/include/cpufunc.h
@@ -236,8 +236,8 @@ invd(void)
  * (this is a bug) and the inlining cost is prohibitive since the call
  * executes into the IPI transmission system.
  */
-void	invlpg		__P((u_int addr));
-void	invltlb		__P((void));
+void	invlpg		(u_int addr);
+void	invltlb		(void);
 
 static __inline void
 cpu_invlpg(void *addr)
@@ -580,52 +580,52 @@ cpu_critical_exit(critical_t eflags)
 
 #else /* !__GNUC__ */
 
-int	breakpoint	__P((void));
-u_int	bsfl		__P((u_int mask));
-u_int	bsrl		__P((u_int mask));
-void	disable_intr	__P((void));
-void	do_cpuid	__P((u_int ax, u_int *p));
-void	enable_intr	__P((void));
-u_char	inb		__P((u_int port));
-u_int	inl		__P((u_int port));
-void	insb		__P((u_int port, void *addr, size_t cnt));
-void	insl		__P((u_int port, void *addr, size_t cnt));
-void	insw		__P((u_int port, void *addr, size_t cnt));
-void	invd		__P((void));
-void	invlpg		__P((u_int addr));
-void	invltlb		__P((void));
-u_short	inw		__P((u_int port));
-void	outb		__P((u_int port, u_char data));
-void	outl		__P((u_int port, u_int data));
-void	outsb		__P((u_int port, void *addr, size_t cnt));
-void	outsl		__P((u_int port, void *addr, size_t cnt));
-void	outsw		__P((u_int port, void *addr, size_t cnt));
-void	outw		__P((u_int port, u_short data));
-u_int	rcr2		__P((void));
-u_int64_t rdmsr		__P((u_int msr));
-u_int64_t rdpmc		__P((u_int pmc));
-u_int64_t rdtsc		__P((void));
-u_int	read_eflags	__P((void));
-void	wbinvd		__P((void));
-void	write_eflags	__P((u_int ef));
-void	wrmsr		__P((u_int msr, u_int64_t newval));
-u_int	rfs		__P((void));
-u_int	rgs		__P((void));
-void	load_fs		__P((u_int sel));
-void	load_gs		__P((u_int sel));
-critical_t cpu_critical_enter __P((void));
-void	cpu_critical_exit __P((critical_t eflags));
+int	breakpoint	(void);
+u_int	bsfl		(u_int mask);
+u_int	bsrl		(u_int mask);
+void	disable_intr	(void);
+void	do_cpuid	(u_int ax, u_int *p);
+void	enable_intr	(void);
+u_char	inb		(u_int port);
+u_int	inl		(u_int port);
+void	insb		(u_int port, void *addr, size_t cnt);
+void	insl		(u_int port, void *addr, size_t cnt);
+void	insw		(u_int port, void *addr, size_t cnt);
+void	invd		(void);
+void	invlpg		(u_int addr);
+void	invltlb		(void);
+u_short	inw		(u_int port);
+void	outb		(u_int port, u_char data);
+void	outl		(u_int port, u_int data);
+void	outsb		(u_int port, void *addr, size_t cnt);
+void	outsl		(u_int port, void *addr, size_t cnt);
+void	outsw		(u_int port, void *addr, size_t cnt);
+void	outw		(u_int port, u_short data);
+u_int	rcr2		(void);
+u_int64_t rdmsr		(u_int msr);
+u_int64_t rdpmc		(u_int pmc);
+u_int64_t rdtsc		(void);
+u_int	read_eflags	(void);
+void	wbinvd		(void);
+void	write_eflags	(u_int ef);
+void	wrmsr		(u_int msr, u_int64_t newval);
+u_int	rfs		(void);
+u_int	rgs		(void);
+void	load_fs		(u_int sel);
+void	load_gs		(u_int sel);
+critical_t cpu_critical_enter(void);
+void	cpu_critical_exit(critical_t eflags);
 
 #endif	/* __GNUC__ */
 
-void	load_cr0	__P((u_int cr0));
-void	load_cr3	__P((u_int cr3));
-void	load_cr4	__P((u_int cr4));
-void	ltr		__P((u_short sel));
-u_int	rcr0		__P((void));
-u_int	rcr3		__P((void));
-u_int	rcr4		__P((void));
-void    reset_dbregs    __P((void));
+void	load_cr0	(u_int cr0);
+void	load_cr3	(u_int cr3);
+void	load_cr4	(u_int cr4);
+void	ltr		(u_short sel);
+u_int	rcr0		(void);
+u_int	rcr3		(void);
+u_int	rcr4		(void);
+void    reset_dbregs(void);
 __END_DECLS
 
 #endif /* !_MACHINE_CPUFUNC_H_ */
diff --git a/sys/i386/include/dvcfg.h b/sys/i386/include/dvcfg.h
index 3edc1cb..5485f89 100644
--- a/sys/i386/include/dvcfg.h
+++ b/sys/i386/include/dvcfg.h
@@ -50,7 +50,7 @@ struct dvcfg_hwsel {
 
 #define	DVCFG_HWSEL_SZ(array)	(sizeof(array) / sizeof(dvcfg_hw_t))
 
-static __inline dvcfg_hw_t dvcfg_hw __P((struct dvcfg_hwsel *, u_int));
+static __inline dvcfg_hw_t dvcfg_hw(struct dvcfg_hwsel *, u_int);
 
 static __inline dvcfg_hw_t
 dvcfg_hw(selp, num)
diff --git a/sys/i386/include/frame.h b/sys/i386/include/frame.h
index 0cfff1a..c32afc4 100644
--- a/sys/i386/include/frame.h
+++ b/sys/i386/include/frame.h
@@ -153,8 +153,8 @@ struct clockframe {
 	int	cf_ss;
 };
 
-int	kdb_trap __P((int, int, struct trapframe *));
-extern  int (*pmath_emulate) __P((struct trapframe *));
+int	kdb_trap(int, int, struct trapframe *);
+extern  int (*pmath_emulate)(struct trapframe *);
 
 #define	INTR_TO_TRAPFRAME(frame) ((struct trapframe *)&(frame)->if_fs)
 
diff --git a/sys/i386/include/in_cksum.h b/sys/i386/include/in_cksum.h
index 22d02fa..f30c45d 100644
--- a/sys/i386/include/in_cksum.h
+++ b/sys/i386/include/in_cksum.h
@@ -112,7 +112,7 @@ in_pseudo(u_int sum, u_int b, u_int c)
 }
 
 #else
-u_int in_cksum_hdr __P((const struct ip *));
+u_int in_cksum_hdr(const struct ip *);
 #define	in_cksum_update(ip) \
 	do { \
 		int __tmpsum; \
diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h
index ab47a94..4c91d13 100644
--- a/sys/i386/include/md_var.h
+++ b/sys/i386/include/md_var.h
@@ -38,12 +38,12 @@
 
 extern	int	Maxmem;
 extern	u_int	atdevbase;	/* offset in virtual memory of ISA io mem */
-extern	void	(*bcopy_vector) __P((const void *from, void *to, size_t len));
+extern	void	(*bcopy_vector)(const void *from, void *to, size_t len);
 extern	int	busdma_swi_pending;
-extern	int	(*copyin_vector) __P((const void *udaddr, void *kaddr,
-				      size_t len));
-extern	int	(*copyout_vector) __P((const void *kaddr, void *udaddr,
-				       size_t len));
+extern	int	(*copyin_vector)(const void *udaddr, void *kaddr,
+				      size_t len);
+extern	int	(*copyout_vector)(const void *kaddr, void *udaddr,
+				       size_t len);
 extern	u_int	cpu_feature;
 extern	u_int	cpu_high;
 extern	u_int	cpu_id;
@@ -55,43 +55,43 @@ extern	char	kstack[];
 extern	int	need_pre_dma_flush;
 extern	int	need_post_dma_flush;
 #endif
-extern	void	(*ovbcopy_vector) __P((const void *from, void *to, size_t len));
+extern	void	(*ovbcopy_vector)(const void *from, void *to, size_t len);
 extern	char	sigcode[];
 extern	int	szsigcode, szosigcode;
 
-typedef void alias_for_inthand_t __P((u_int cs, u_int ef, u_int esp, u_int ss));
+typedef void alias_for_inthand_t(u_int cs, u_int ef, u_int esp, u_int ss);
 struct	thread;
 struct	reg;
 struct	fpreg;
 struct  dbreg;
 
-void	bcopyb __P((const void *from, void *to, size_t len));
-void	busdma_swi __P((void));
-void	cpu_halt __P((void));
-void	cpu_reset __P((void));
-void	cpu_setregs __P((void));
-void	cpu_switch_load_gs __P((void)) __asm(__STRING(cpu_switch_load_gs));
-void	doreti_iret __P((void)) __asm(__STRING(doreti_iret));
-void	doreti_iret_fault __P((void)) __asm(__STRING(doreti_iret_fault));
-void	doreti_popl_ds __P((void)) __asm(__STRING(doreti_popl_ds));
-void	doreti_popl_ds_fault __P((void)) __asm(__STRING(doreti_popl_ds_fault));
-void	doreti_popl_es __P((void)) __asm(__STRING(doreti_popl_es));
-void	doreti_popl_es_fault __P((void)) __asm(__STRING(doreti_popl_es_fault));
-void	doreti_popl_fs __P((void)) __asm(__STRING(doreti_popl_fs));
-void	doreti_popl_fs_fault __P((void)) __asm(__STRING(doreti_popl_fs_fault));
-void	fillw __P((int /*u_short*/ pat, void *base, size_t cnt));
-void	i486_bzero __P((void *buf, size_t len));
-void	i586_bcopy __P((const void *from, void *to, size_t len));
-void	i586_bzero __P((void *buf, size_t len));
-int	i586_copyin __P((const void *udaddr, void *kaddr, size_t len));
-int	i586_copyout __P((const void *kaddr, void *udaddr, size_t len));
-void	i686_pagezero __P((void *addr));
-int	is_physical_memory __P((vm_offset_t addr));
-u_long	kvtop __P((void *addr));
-void	setidt __P((int idx, alias_for_inthand_t *func, int typ, int dpl,
-		    int selec));
-void	swi_vm __P((void *));
-void	userconfig __P((void));
-int     user_dbreg_trap __P((void));
+void	bcopyb(const void *from, void *to, size_t len);
+void	busdma_swi(void);
+void	cpu_halt(void);
+void	cpu_reset(void);
+void	cpu_setregs(void);
+void	cpu_switch_load_gs(void) __asm(__STRING(cpu_switch_load_gs));
+void	doreti_iret(void) __asm(__STRING(doreti_iret));
+void	doreti_iret_fault(void) __asm(__STRING(doreti_iret_fault));
+void	doreti_popl_ds(void) __asm(__STRING(doreti_popl_ds));
+void	doreti_popl_ds_fault(void) __asm(__STRING(doreti_popl_ds_fault));
+void	doreti_popl_es(void) __asm(__STRING(doreti_popl_es));
+void	doreti_popl_es_fault(void) __asm(__STRING(doreti_popl_es_fault));
+void	doreti_popl_fs(void) __asm(__STRING(doreti_popl_fs));
+void	doreti_popl_fs_fault(void) __asm(__STRING(doreti_popl_fs_fault));
+void	fillw(int /*u_short*/ pat, void *base, size_t cnt);
+void	i486_bzero(void *buf, size_t len);
+void	i586_bcopy(const void *from, void *to, size_t len);
+void	i586_bzero(void *buf, size_t len);
+int	i586_copyin(const void *udaddr, void *kaddr, size_t len);
+int	i586_copyout(const void *kaddr, void *udaddr, size_t len);
+void	i686_pagezero(void *addr);
+int	is_physical_memory(vm_offset_t addr);
+u_long	kvtop(void *addr);
+void	setidt(int idx, alias_for_inthand_t *func, int typ, int dpl,
+		    int selec);
+void	swi_vm(void *);
+void	userconfig(void);
+int     user_dbreg_trap(void);
 
 #endif /* !_MACHINE_MD_VAR_H_ */
diff --git a/sys/i386/include/npx.h b/sys/i386/include/npx.h
index 589a4be..4746f5c 100644
--- a/sys/i386/include/npx.h
+++ b/sys/i386/include/npx.h
@@ -141,11 +141,11 @@ union	savefpu {
 #define	__INITIAL_NPXCW__	0x127F
 
 #ifdef _KERNEL
-int	npxdna __P((void));
-void	npxexit __P((struct thread *td));
-void	npxinit __P((int control));
-void	npxsave __P((union savefpu *addr));
-int	npxtrap __P((void));
+int	npxdna(void);
+void	npxexit(struct thread *td);
+void	npxinit(int control);
+void	npxsave(union savefpu *addr);
+int	npxtrap(void);
 #endif
 
 #endif /* !_MACHINE_NPX_H_ */
diff --git a/sys/i386/include/pcb.h b/sys/i386/include/pcb.h
index d4a375a..b2f1bc4 100644
--- a/sys/i386/include/pcb.h
+++ b/sys/i386/include/pcb.h
@@ -80,7 +80,7 @@ struct md_coredump {
 };
 
 #ifdef _KERNEL
-void	savectx __P((struct pcb *));
+void	savectx(struct pcb *);
 #endif
 
 #endif /* _I386_PCB_H_ */
diff --git a/sys/i386/include/pcb_ext.h b/sys/i386/include/pcb_ext.h
index 3256f99..cf5a911 100644
--- a/sys/i386/include/pcb_ext.h
+++ b/sys/i386/include/pcb_ext.h
@@ -45,7 +45,7 @@ struct pcb_ext {
 
 #ifdef _KERNEL
 
-int i386_extend_pcb __P((struct thread *));
+int i386_extend_pcb(struct thread *);
 
 #endif
 
diff --git a/sys/i386/include/perfmon.h b/sys/i386/include/perfmon.h
index adf460e..f012ee5 100644
--- a/sys/i386/include/perfmon.h
+++ b/sys/i386/include/perfmon.h
@@ -102,15 +102,15 @@ struct pmc_tstamp {
 /*
  * Intra-kernel interface to performance monitoring counters
  */
-void	perfmon_init  __P((void));
-int	perfmon_avail __P((void));
-int	perfmon_setup __P((int, unsigned int));
-int	perfmon_get   __P((int, unsigned int *));
-int	perfmon_fini  __P((int));
-int	perfmon_start __P((int));
-int	perfmon_stop  __P((int));
-int	perfmon_read  __P((int, quad_t *));
-int	perfmon_reset __P((int));
+void	perfmon_init(void);
+int	perfmon_avail(void);
+int	perfmon_setup(int, unsigned int);
+int	perfmon_get(int, unsigned int *);
+int	perfmon_fini(int);
+int	perfmon_start(int);
+int	perfmon_stop(int);
+int	perfmon_read(int, quad_t *);
+int	perfmon_reset(int);
 
 #endif /* _KERNEL */
 
diff --git a/sys/i386/include/physio_proc.h b/sys/i386/include/physio_proc.h
index b034e9a..74848a4 100644
--- a/sys/i386/include/physio_proc.h
+++ b/sys/i386/include/physio_proc.h
@@ -38,8 +38,8 @@
 struct physio_proc {
 };
 
-static __inline struct physio_proc *physio_proc_enter __P((struct buf *));
-static __inline void physio_proc_leave __P((struct physio_proc *));
+static __inline struct physio_proc *physio_proc_enter(struct buf *);
+static __inline void physio_proc_leave(struct physio_proc *);
 
 static __inline struct physio_proc *
 physio_proc_enter(bp)
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index 7358a9e..7348b67 100644
--- a/sys/i386/include/pmap.h
+++ b/sys/i386/include/pmap.h
@@ -261,14 +261,14 @@ extern char *ptvmmap;		/* poor name! */
 extern vm_offset_t virtual_avail;
 extern vm_offset_t virtual_end;
 
-void	pmap_bootstrap __P(( vm_offset_t, vm_offset_t));
-pmap_t	pmap_kernel __P((void));
-void	*pmap_mapdev __P((vm_offset_t, vm_size_t));
-void	pmap_unmapdev __P((vm_offset_t, vm_size_t));
-pt_entry_t *pmap_pte __P((pmap_t, vm_offset_t)) __pure2;
-vm_page_t pmap_use_pt __P((pmap_t, vm_offset_t));
+void	pmap_bootstrap( vm_offset_t, vm_offset_t);
+pmap_t	pmap_kernel(void);
+void	*pmap_mapdev(vm_offset_t, vm_size_t);
+void	pmap_unmapdev(vm_offset_t, vm_size_t);
+pt_entry_t *pmap_pte(pmap_t, vm_offset_t) __pure2;
+vm_page_t pmap_use_pt(pmap_t, vm_offset_t);
 #ifdef SMP
-void	pmap_set_opt __P((void));
+void	pmap_set_opt(void);
 #endif
 
 #endif /* _KERNEL */
diff --git a/sys/i386/include/proc.h b/sys/i386/include/proc.h
index 5b50824..f011b5c 100644
--- a/sys/i386/include/proc.h
+++ b/sys/i386/include/proc.h
@@ -59,9 +59,9 @@ struct mdproc {
 
 #ifdef	_KERNEL
 
-void 	set_user_ldt __P((struct mdproc *));
-struct 	proc_ldt *user_ldt_alloc __P((struct mdproc *, int));
-void 	user_ldt_free __P((struct thread *));
+void 	set_user_ldt(struct mdproc *);
+struct 	proc_ldt *user_ldt_alloc(struct mdproc *, int);
+void 	user_ldt_free(struct thread *);
 
 #endif	/* _KERNEL */
 
diff --git a/sys/i386/include/profile.h b/sys/i386/include/profile.h
index bd8a7da..a00f475 100644
--- a/sys/i386/include/profile.h
+++ b/sys/i386/include/profile.h
@@ -117,16 +117,16 @@ typedef	u_int	fptrdiff_t;
 
 #ifdef _KERNEL
 
-void	mcount __P((uintfptr_t frompc, uintfptr_t selfpc));
-void	kmupetext __P((uintfptr_t nhighpc));
+void	mcount(uintfptr_t frompc, uintfptr_t selfpc);
+void	kmupetext(uintfptr_t nhighpc);
 
 #ifdef GUPROF
 struct gmonparam;
 
-void	nullfunc_loop_profiled __P((void));
-void	nullfunc_profiled __P((void));
-void	startguprof __P((struct gmonparam *p));
-void	stopguprof __P((struct gmonparam *p));
+void	nullfunc_loop_profiled(void);
+void	nullfunc_profiled(void);
+void	startguprof(struct gmonparam *p);
+void	stopguprof(struct gmonparam *p);
 #else
 #define	startguprof(p)
 #define	stopguprof(p)
@@ -139,12 +139,12 @@ void	stopguprof __P((struct gmonparam *p));
 __BEGIN_DECLS
 #ifdef __GNUC__
 #ifdef __ELF__
-void	mcount __P((void)) __asm(".mcount");
+void	mcount(void) __asm(".mcount");
 #else
-void	mcount __P((void)) __asm("mcount");
+void	mcount(void) __asm("mcount");
 #endif
 #endif
-static void	_mcount __P((uintfptr_t frompc, uintfptr_t selfpc));
+static void	_mcount(uintfptr_t frompc, uintfptr_t selfpc);
 __END_DECLS
 
 #endif /* _KERNEL */
@@ -154,11 +154,11 @@ __END_DECLS
 extern int	cputime_bias;
 
 __BEGIN_DECLS
-int	cputime __P((void));
-void	empty_loop __P((void));
-void	mexitcount __P((uintfptr_t selfpc));
-void	nullfunc __P((void));
-void	nullfunc_loop __P((void));
+int	cputime(void);
+void	empty_loop(void);
+void	mexitcount(uintfptr_t selfpc);
+void	nullfunc(void);
+void	nullfunc_loop(void);
 __END_DECLS
 #endif
 
diff --git a/sys/i386/include/reg.h b/sys/i386/include/reg.h
index 3f3c774..ca15fb2 100644
--- a/sys/i386/include/reg.h
+++ b/sys/i386/include/reg.h
@@ -143,13 +143,13 @@ struct dbreg {
 /*
  * XXX these interfaces are MI, so they should be declared in a MI place.
  */
-void	setregs __P((struct thread *, u_long, u_long, u_long));
-int	fill_regs __P((struct thread *, struct reg *));
-int	set_regs __P((struct thread *, struct reg *));
-int	fill_fpregs __P((struct thread *, struct fpreg *));
-int	set_fpregs __P((struct thread *, struct fpreg *));
-int	fill_dbregs __P((struct thread *, struct dbreg *));
-int	set_dbregs __P((struct thread *, struct dbreg *));
+void	setregs(struct thread *, u_long, u_long, u_long);
+int	fill_regs(struct thread *, struct reg *);
+int	set_regs(struct thread *, struct reg *);
+int	fill_fpregs(struct thread *, struct fpreg *);
+int	set_fpregs(struct thread *, struct fpreg *);
+int	fill_dbregs(struct thread *, struct dbreg *);
+int	set_dbregs(struct thread *, struct dbreg *);
 #endif
 
 #endif /* !_MACHINE_REG_H_ */
diff --git a/sys/i386/include/segments.h b/sys/i386/include/segments.h
index d671e12..3e47fa8 100644
--- a/sys/i386/include/segments.h
+++ b/sys/i386/include/segments.h
@@ -247,13 +247,13 @@ extern struct soft_segment_descriptor gdt_segs[];
 extern struct gate_descriptor *idt;
 extern union descriptor ldt[NLDT];
 
-void	lgdt		__P((struct region_descriptor *rdp));
-void	lidt		__P((struct region_descriptor *rdp));
-void	lldt		__P((u_short sel));
-void	sdtossd		__P((struct segment_descriptor *sdp,
-			     struct soft_segment_descriptor *ssdp));
-void	ssdtosd		__P((struct soft_segment_descriptor *ssdp,
-			     struct segment_descriptor *sdp));
+void	lgdt		(struct region_descriptor *rdp);
+void	lidt		(struct region_descriptor *rdp);
+void	lldt		(u_short sel);
+void	sdtossd		(struct segment_descriptor *sdp,
+			     struct soft_segment_descriptor *ssdp);
+void	ssdtosd		(struct soft_segment_descriptor *ssdp,
+			     struct segment_descriptor *sdp);
 #endif /* _KERNEL */
 
 #endif /* !_MACHINE_SEGMENTS_H_ */
diff --git a/sys/i386/include/smp.h b/sys/i386/include/smp.h
index 34228e2..3a57c00 100644
--- a/sys/i386/include/smp.h
+++ b/sys/i386/include/smp.h
@@ -61,7 +61,7 @@ extern int current_postcode;  /** XXX currently in mp_machdep.c */
 extern int			bootMP_size;
 
 /* functions in mpboot.s */
-void	bootMP			__P((void));
+void	bootMP			(void);
 
 /* global data in mp_machdep.c */
 extern int			bsp_apic_ready;
@@ -88,36 +88,36 @@ extern struct apic_intmapinfo	int_to_apicintpin[];
 extern struct pcb		stoppcbs[];
 
 /* functions in mp_machdep.c */
-void	i386_mp_probe		__P((void));
-u_int	mp_bootaddress		__P((u_int));
-u_int	isa_apic_mask		__P((u_int));
-int	isa_apic_irq		__P((int));
-int	pci_apic_irq		__P((int, int, int));
-int	apic_irq		__P((int, int));
-int	next_apic_irq		__P((int));
-int	undirect_isa_irq	__P((int));
-int	undirect_pci_irq	__P((int));
-int	apic_bus_type		__P((int));
-int	apic_src_bus_id		__P((int, int));
-int	apic_src_bus_irq	__P((int, int));
-int	apic_int_type		__P((int, int));
-int	apic_trigger		__P((int, int));
-int	apic_polarity		__P((int, int));
-void	assign_apic_irq		__P((int apic, int intpin, int irq));
-void	revoke_apic_irq		__P((int irq));
-void	bsp_apic_configure	__P((void));
-void	init_secondary		__P((void));
-void	smp_invltlb		__P((void));
-void	forward_statclock	__P((void));
-void	forwarded_statclock	__P((struct trapframe frame));
-void	forward_hardclock	__P((void));
-void	forwarded_hardclock	__P((struct trapframe frame));
-void	ipi_selected		__P((u_int cpus, u_int ipi));
-void	ipi_all			__P((u_int ipi));
-void	ipi_all_but_self	__P((u_int ipi));
-void	ipi_self		__P((u_int ipi));
+void	i386_mp_probe		(void);
+u_int	mp_bootaddress		(u_int);
+u_int	isa_apic_mask		(u_int);
+int	isa_apic_irq		(int);
+int	pci_apic_irq		(int, int, int);
+int	apic_irq		(int, int);
+int	next_apic_irq		(int);
+int	undirect_isa_irq	(int);
+int	undirect_pci_irq	(int);
+int	apic_bus_type		(int);
+int	apic_src_bus_id		(int, int);
+int	apic_src_bus_irq	(int, int);
+int	apic_int_type		(int, int);
+int	apic_trigger		(int, int);
+int	apic_polarity		(int, int);
+void	assign_apic_irq		(int apic, int intpin, int irq);
+void	revoke_apic_irq		(int irq);
+void	bsp_apic_configure	(void);
+void	init_secondary		(void);
+void	smp_invltlb		(void);
+void	forward_statclock	(void);
+void	forwarded_statclock	(struct trapframe frame);
+void	forward_hardclock	(void);
+void	forwarded_hardclock	(struct trapframe frame);
+void	ipi_selected		(u_int cpus, u_int ipi);
+void	ipi_all			(u_int ipi);
+void	ipi_all_but_self	(u_int ipi);
+void	ipi_self		(u_int ipi);
 #ifdef	APIC_INTR_REORDER
-void	set_lapic_isrloc	__P((int, int));
+void	set_lapic_isrloc	(int, int);
 #endif /* APIC_INTR_REORDER */
 
 /* global data in mpapic.c */
@@ -125,22 +125,22 @@ extern volatile lapic_t		lapic;
 extern volatile ioapic_t	**ioapic;
 
 /* functions in mpapic.c */
-void	apic_dump		__P((char*));
-void	apic_initialize		__P((void));
-void	imen_dump		__P((void));
-int	apic_ipi		__P((int, int, int));
-int	selected_apic_ipi	__P((u_int, int, int));
-int	io_apic_setup		__P((int));
-void	io_apic_setup_intpin	__P((int, int));
-void	io_apic_set_id		__P((int, int));
-int	io_apic_get_id		__P((int));
-int	ext_int_setup		__P((int, int));
-
-void	set_apic_timer		__P((int));
-int	read_apic_timer		__P((void));
-void	u_sleep			__P((int));
-u_int	io_apic_read		__P((int, int));
-void	io_apic_write		__P((int, int, u_int));
+void	apic_dump		(char*);
+void	apic_initialize		(void);
+void	imen_dump		(void);
+int	apic_ipi		(int, int, int);
+int	selected_apic_ipi	(u_int, int, int);
+int	io_apic_setup		(int);
+void	io_apic_setup_intpin	(int, int);
+void	io_apic_set_id		(int, int);
+int	io_apic_get_id		(int);
+int	ext_int_setup		(int, int);
+
+void	set_apic_timer		(int);
+int	read_apic_timer		(void);
+void	u_sleep			(int);
+u_int	io_apic_read		(int, int);
+void	io_apic_write		(int, int, u_int);
 
 #endif /* !LOCORE */
 #endif /* SMP && !APIC_IO */
diff --git a/sys/i386/include/sysarch.h b/sys/i386/include/sysarch.h
index eb65000..6ce9768 100644
--- a/sys/i386/include/sysarch.h
+++ b/sys/i386/include/sysarch.h
@@ -71,13 +71,13 @@ union descriptor;
 struct dbreg;
 
 __BEGIN_DECLS
-int i386_get_ldt __P((int, union descriptor *, int));
-int i386_set_ldt __P((int, union descriptor *, int));
-int i386_get_ioperm __P((unsigned int, unsigned int *, int *));
-int i386_set_ioperm __P((unsigned int, unsigned int, int));
-int i386_vm86 __P((int, void *));
-int i386_set_watch __P((int, unsigned int, int, int, struct dbreg *));
-int i386_clr_watch __P((int, struct dbreg *));
+int i386_get_ldt(int, union descriptor *, int);
+int i386_set_ldt(int, union descriptor *, int);
+int i386_get_ioperm(unsigned int, unsigned int *, int *);
+int i386_set_ioperm(unsigned int, unsigned int, int);
+int i386_vm86(int, void *);
+int i386_set_watch(int, unsigned int, int, int, struct dbreg *);
+int i386_clr_watch(int, struct dbreg *);
 __END_DECLS
 #endif
 
diff --git a/sys/i386/include/types.h b/sys/i386/include/types.h
index 4b11496..680ce14 100644
--- a/sys/i386/include/types.h
+++ b/sys/i386/include/types.h
@@ -67,6 +67,6 @@ typedef	register_t	critical_t;
 typedef	__uint32_t	intrmask_t;
 
 /* Interrupt handler function type. */
-typedef	void		ointhand2_t __P((int _device_id));
+typedef	void		ointhand2_t(int _device_id);
 
 #endif /* !_MACHINE_TYPES_H_ */
diff --git a/sys/i386/include/vm86.h b/sys/i386/include/vm86.h
index 456e4f7..f20a689 100644
--- a/sys/i386/include/vm86.h
+++ b/sys/i386/include/vm86.h
@@ -149,18 +149,17 @@ extern	int in_vm86call;
 extern 	int vm86paddr;
 
 struct thread;
-extern	int vm86_emulate __P((struct vm86frame *));
-extern	int vm86_sysarch __P((struct thread *, char *));
-extern void vm86_trap __P((struct vm86frame *));
-extern 	int vm86_intcall __P((int, struct vm86frame *));
-extern 	int vm86_datacall __P((int, struct vm86frame *, struct vm86context *));
-extern void vm86_initialize __P((void));
-extern vm_offset_t vm86_getpage __P((struct vm86context *, int));
-extern vm_offset_t vm86_addpage __P((struct vm86context *, int, vm_offset_t));
-extern int vm86_getptr __P((struct vm86context *, vm_offset_t,
-				u_short *, u_short *));
-
-extern vm_offset_t vm86_getaddr __P((struct vm86context *, u_short, u_short));
+extern	int vm86_emulate(struct vm86frame *);
+extern	int vm86_sysarch(struct thread *, char *);
+extern void vm86_trap(struct vm86frame *);
+extern 	int vm86_intcall(int, struct vm86frame *);
+extern 	int vm86_datacall(int, struct vm86frame *, struct vm86context *);
+extern void vm86_initialize(void);
+extern vm_offset_t vm86_getpage(struct vm86context *, int);
+extern vm_offset_t vm86_addpage(struct vm86context *, int, vm_offset_t);
+extern int vm86_getptr(struct vm86context *, vm_offset_t, u_short *, u_short *);
+
+extern vm_offset_t vm86_getaddr(struct vm86context *, u_short, u_short);
 #endif /* _KERNEL */
 
 #endif /* _MACHINE_VM86_H_ */