Remove __P(). This was tested on the GENERIC kernel.

8 files changed, 86 insertions, 87 deletions

diff --git a/sys/alpha/osf1/osf1_ioctl.c b/sys/alpha/osf1/osf1_ioctl.c
index 5f3ede1..e4e230c 100644
--- a/sys/alpha/osf1/osf1_ioctl.c
+++ b/sys/alpha/osf1/osf1_ioctl.c
@@ -56,14 +56,14 @@
 
 /*#define	IOCTL_DEBUG*/
 
-int osf1_ioctl_i	__P((struct thread *td, struct ioctl_args *nuap,
-			    int cmd, int dir, int len));
-int osf1_ioctl_t	__P((struct thread *td, struct ioctl_args *nuap,
-			    int cmd, int dir, int len));
-int osf1_ioctl_f	__P((struct thread *td, struct ioctl_args *nuap,
-			    int cmd, int dir, int len));
-int osf1_ioctl_m	__P((struct thread *td, struct ioctl_args *nuap,
-			    int cmd, int dir, int len));
+int osf1_ioctl_i(struct thread *td, struct ioctl_args *nuap,
+			    int cmd, int dir, int len);
+int osf1_ioctl_t(struct thread *td, struct ioctl_args *nuap,
+			    int cmd, int dir, int len);
+int osf1_ioctl_f(struct thread *td, struct ioctl_args *nuap,
+			    int cmd, int dir, int len);
+int osf1_ioctl_m(struct thread *td, struct ioctl_args *nuap,
+			    int cmd, int dir, int len);
 
 int
 osf1_ioctl(td, uap)
diff --git a/sys/alpha/osf1/osf1_misc.c b/sys/alpha/osf1/osf1_misc.c
index 235ba90..7c82947 100644
--- a/sys/alpha/osf1/osf1_misc.c
+++ b/sys/alpha/osf1/osf1_misc.c
@@ -90,8 +90,8 @@
 #include <machine/fpu.h>
 #include <machine/rpb.h>
 
-static void cvtstat2osf1 __P((struct stat *, struct osf1_stat *));
-static int  osf2bsd_pathconf __P((int *));
+static void cvtstat2osf1(struct stat *, struct osf1_stat *);
+static int  osf2bsd_pathconf(int *);
 
 static const char osf1_emul_path[] = "/compat/osf1";
 /*
diff --git a/sys/alpha/osf1/osf1_mount.c b/sys/alpha/osf1/osf1_mount.c
index 4244da3..faa9178 100644
--- a/sys/alpha/osf1/osf1_mount.c
+++ b/sys/alpha/osf1/osf1_mount.c
@@ -68,11 +68,11 @@
 #include <alpha/osf1/osf1.h>
 
 
-void bsd2osf_statfs __P((struct statfs *, struct osf1_statfs *));
-int osf1_mount_mfs __P((struct thread *, struct osf1_mount_args *,
-			struct mount_args *));
-int osf1_mount_nfs __P((struct thread *, struct osf1_mount_args *,
-			struct mount_args *));
+void bsd2osf_statfs(struct statfs *, struct osf1_statfs *);
+int osf1_mount_mfs(struct thread *, struct osf1_mount_args *,
+			struct mount_args *);
+int osf1_mount_nfs(struct thread *, struct osf1_mount_args *,
+			struct mount_args *);
 
 #ifdef notanymore
 static const	char *fsnames[OSF1_MOUNT_MAXTYPE+2] = INITMOUNTNAMES;
diff --git a/sys/alpha/osf1/osf1_proto.h b/sys/alpha/osf1/osf1_proto.h
index 11784e7..a6f0d5c 100644
--- a/sys/alpha/osf1/osf1_proto.h
+++ b/sys/alpha/osf1/osf1_proto.h
@@ -296,64 +296,64 @@ struct osf1_setsysinfo_args {
 	char arg_l_[PADL_(caddr_t)]; caddr_t arg; char arg_r_[PADR_(caddr_t)];
 	char flag_l_[PADL_(u_long)]; u_long flag; char flag_r_[PADR_(u_long)];
 };
-int	osf1_wait4 __P((struct thread *, struct osf1_wait4_args *));
-int	osf1_mknod __P((struct thread *, struct osf1_mknod_args *));
-int	osf1_getfsstat __P((struct thread *, struct osf1_getfsstat_args *));
-int	osf1_lseek __P((struct thread *, struct osf1_lseek_args *));
-int	osf1_mount __P((struct thread *, struct osf1_mount_args *));
-int	osf1_unmount __P((struct thread *, struct osf1_unmount_args *));
-int	osf1_setuid __P((struct thread *, struct osf1_setuid_args *));
-int	osf1_access __P((struct thread *, struct osf1_access_args *));
-int	osf1_kill __P((struct thread *, struct osf1_kill_args *));
-int	osf1_set_program_attributes __P((struct thread *, struct osf1_set_program_attributes_args *));
-int	osf1_open __P((struct thread *, struct osf1_open_args *));
-int	osf1_sigprocmask __P((struct thread *, struct osf1_sigprocmask_args *));
-int	osf1_sigpending __P((struct thread *, struct osf1_sigpending_args *));
-int	osf1_classcntl __P((struct thread *, struct osf1_classcntl_args *));
-int	osf1_ioctl __P((struct thread *, struct osf1_ioctl_args *));
-int	osf1_reboot __P((struct thread *, struct osf1_reboot_args *));
-int	osf1_execve __P((struct thread *, struct osf1_execve_args *));
-int	osf1_stat __P((struct thread *, struct osf1_stat_args *));
-int	osf1_lstat __P((struct thread *, struct osf1_lstat_args *));
-int	osf1_mmap __P((struct thread *, struct osf1_mmap_args *));
-int	osf1_madvise __P((struct thread *, struct osf1_madvise_args *));
-int	osf1_setpgrp __P((struct thread *, struct osf1_setpgrp_args *));
-int	osf1_setitimer __P((struct thread *, struct osf1_setitimer_args *));
-int	osf1_table __P((struct thread *, struct osf1_table_args *));
-int	osf1_getitimer __P((struct thread *, struct osf1_getitimer_args *));
-int	osf1_fstat __P((struct thread *, struct osf1_fstat_args *));
-int	osf1_fcntl __P((struct thread *, struct osf1_fcntl_args *));
-int	osf1_select __P((struct thread *, struct osf1_select_args *));
-int	osf1_socket __P((struct thread *, struct osf1_socket_args *));
-int	osf1_sigreturn __P((struct thread *, struct osf1_sigreturn_args *));
-int	osf1_sigsuspend __P((struct thread *, struct osf1_sigsuspend_args *));
-int	osf1_osigstack __P((struct thread *, struct osf1_osigstack_args *));
-int	osf1_gettimeofday __P((struct thread *, struct osf1_gettimeofday_args *));
-int	osf1_getrusage __P((struct thread *, struct osf1_getrusage_args *));
-int	osf1_readv __P((struct thread *, struct osf1_readv_args *));
-int	osf1_writev __P((struct thread *, struct osf1_writev_args *));
-int	osf1_truncate __P((struct thread *, struct osf1_truncate_args *));
-int	osf1_ftruncate __P((struct thread *, struct osf1_ftruncate_args *));
-int	osf1_setgid __P((struct thread *, struct osf1_setgid_args *));
-int	osf1_sendto __P((struct thread *, struct osf1_sendto_args *));
-int	osf1_getrlimit __P((struct thread *, struct osf1_getrlimit_args *));
-int	osf1_setrlimit __P((struct thread *, struct osf1_setrlimit_args *));
-int	osf1_sigaction __P((struct thread *, struct osf1_sigaction_args *));
-int	osf1_statfs __P((struct thread *, struct osf1_statfs_args *));
-int	osf1_fstatfs __P((struct thread *, struct osf1_fstatfs_args *));
-int	osf1_msync __P((struct thread *, struct osf1_msync_args *));
-int	osf1_signal __P((struct thread *, struct osf1_signal_args *));
-int	osf1_sigaltstack __P((struct thread *, struct osf1_sigaltstack_args *));
-int	osf1_sysinfo __P((struct thread *, struct osf1_sysinfo_args *));
-int	osf1_proplist_syscall __P((struct thread *, struct osf1_proplist_syscall_args *));
-int	osf1_ntpadjtime __P((struct thread *, struct osf1_ntpadjtime_args *));
-int	osf1_ntpgettime __P((struct thread *, struct osf1_ntpgettime_args *));
-int	osf1_pathconf __P((struct thread *, struct osf1_pathconf_args *));
-int	osf1_fpathconf __P((struct thread *, struct osf1_fpathconf_args *));
-int	osf1_uswitch __P((struct thread *, struct osf1_uswitch_args *));
-int	osf1_usleep_thread __P((struct thread *, struct osf1_usleep_thread_args *));
-int	osf1_getsysinfo __P((struct thread *, struct osf1_getsysinfo_args *));
-int	osf1_setsysinfo __P((struct thread *, struct osf1_setsysinfo_args *));
+int	osf1_wait4(struct thread *, struct osf1_wait4_args *);
+int	osf1_mknod(struct thread *, struct osf1_mknod_args *);
+int	osf1_getfsstat(struct thread *, struct osf1_getfsstat_args *);
+int	osf1_lseek(struct thread *, struct osf1_lseek_args *);
+int	osf1_mount(struct thread *, struct osf1_mount_args *);
+int	osf1_unmount(struct thread *, struct osf1_unmount_args *);
+int	osf1_setuid(struct thread *, struct osf1_setuid_args *);
+int	osf1_access(struct thread *, struct osf1_access_args *);
+int	osf1_kill(struct thread *, struct osf1_kill_args *);
+int	osf1_set_program_attributes(struct thread *, struct osf1_set_program_attributes_args *);
+int	osf1_open(struct thread *, struct osf1_open_args *);
+int	osf1_sigprocmask(struct thread *, struct osf1_sigprocmask_args *);
+int	osf1_sigpending(struct thread *, struct osf1_sigpending_args *);
+int	osf1_classcntl(struct thread *, struct osf1_classcntl_args *);
+int	osf1_ioctl(struct thread *, struct osf1_ioctl_args *);
+int	osf1_reboot(struct thread *, struct osf1_reboot_args *);
+int	osf1_execve(struct thread *, struct osf1_execve_args *);
+int	osf1_stat(struct thread *, struct osf1_stat_args *);
+int	osf1_lstat(struct thread *, struct osf1_lstat_args *);
+int	osf1_mmap(struct thread *, struct osf1_mmap_args *);
+int	osf1_madvise(struct thread *, struct osf1_madvise_args *);
+int	osf1_setpgrp(struct thread *, struct osf1_setpgrp_args *);
+int	osf1_setitimer(struct thread *, struct osf1_setitimer_args *);
+int	osf1_table(struct thread *, struct osf1_table_args *);
+int	osf1_getitimer(struct thread *, struct osf1_getitimer_args *);
+int	osf1_fstat(struct thread *, struct osf1_fstat_args *);
+int	osf1_fcntl(struct thread *, struct osf1_fcntl_args *);
+int	osf1_select(struct thread *, struct osf1_select_args *);
+int	osf1_socket(struct thread *, struct osf1_socket_args *);
+int	osf1_sigreturn(struct thread *, struct osf1_sigreturn_args *);
+int	osf1_sigsuspend(struct thread *, struct osf1_sigsuspend_args *);
+int	osf1_osigstack(struct thread *, struct osf1_osigstack_args *);
+int	osf1_gettimeofday(struct thread *, struct osf1_gettimeofday_args *);
+int	osf1_getrusage(struct thread *, struct osf1_getrusage_args *);
+int	osf1_readv(struct thread *, struct osf1_readv_args *);
+int	osf1_writev(struct thread *, struct osf1_writev_args *);
+int	osf1_truncate(struct thread *, struct osf1_truncate_args *);
+int	osf1_ftruncate(struct thread *, struct osf1_ftruncate_args *);
+int	osf1_setgid(struct thread *, struct osf1_setgid_args *);
+int	osf1_sendto(struct thread *, struct osf1_sendto_args *);
+int	osf1_getrlimit(struct thread *, struct osf1_getrlimit_args *);
+int	osf1_setrlimit(struct thread *, struct osf1_setrlimit_args *);
+int	osf1_sigaction(struct thread *, struct osf1_sigaction_args *);
+int	osf1_statfs(struct thread *, struct osf1_statfs_args *);
+int	osf1_fstatfs(struct thread *, struct osf1_fstatfs_args *);
+int	osf1_msync(struct thread *, struct osf1_msync_args *);
+int	osf1_signal(struct thread *, struct osf1_signal_args *);
+int	osf1_sigaltstack(struct thread *, struct osf1_sigaltstack_args *);
+int	osf1_sysinfo(struct thread *, struct osf1_sysinfo_args *);
+int	osf1_proplist_syscall(struct thread *, struct osf1_proplist_syscall_args *);
+int	osf1_ntpadjtime(struct thread *, struct osf1_ntpadjtime_args *);
+int	osf1_ntpgettime(struct thread *, struct osf1_ntpgettime_args *);
+int	osf1_pathconf(struct thread *, struct osf1_pathconf_args *);
+int	osf1_fpathconf(struct thread *, struct osf1_fpathconf_args *);
+int	osf1_uswitch(struct thread *, struct osf1_uswitch_args *);
+int	osf1_usleep_thread(struct thread *, struct osf1_usleep_thread_args *);
+int	osf1_getsysinfo(struct thread *, struct osf1_getsysinfo_args *);
+int	osf1_setsysinfo(struct thread *, struct osf1_setsysinfo_args *);
 
 #ifdef COMPAT_43
 
diff --git a/sys/alpha/osf1/osf1_signal.c b/sys/alpha/osf1/osf1_signal.c
index 4696689..9e0cf5a 100644
--- a/sys/alpha/osf1/osf1_signal.c
+++ b/sys/alpha/osf1/osf1_signal.c
@@ -86,10 +86,10 @@
 #define	DPRINTF uprintf
 int osf1_sigdbg = 0;
 
-static void bsd_to_osf1_sigaction __P((const struct sigaction *bsa,
-					struct osf1_sigaction *osa));
-static void osf1_to_bsd_sigaction __P((const struct osf1_sigaction *osa,
-					struct sigaction *bsa));
+static void bsd_to_osf1_sigaction(const struct sigaction *bsa,
+					struct osf1_sigaction *osa);
+static void osf1_to_bsd_sigaction(const struct osf1_sigaction *osa,
+					struct sigaction *bsa);
 
 #define	sigemptyset(s)		SIGEMPTYSET(*(s))
 #define	sigismember(s, n)	SIGISMEMBER(*(s), n)
diff --git a/sys/alpha/osf1/osf1_signal.h b/sys/alpha/osf1/osf1_signal.h
index 2559f67..ec1fbeb 100644
--- a/sys/alpha/osf1/osf1_signal.h
+++ b/sys/alpha/osf1/osf1_signal.h
@@ -19,7 +19,7 @@
 
 
 typedef u_long	osf1_sigset_t;
-typedef void	(*osf1_handler_t) __P((int));
+typedef void	(*osf1_handler_t)(int);
 
 struct osf1_sigaction {
 	osf1_handler_t	osa_handler;
@@ -57,11 +57,11 @@ struct osf1_sigaltstack {
 
 
 extern int osf1_to_linux_sig[];
-void bsd_to_osf1_sigaltstack __P((const struct sigaltstack *, struct osf1_sigaltstack *));
-void bsd_to_osf1_sigset __P((const sigset_t *, osf1_sigset_t *));
-void osf1_to_bsd_sigaltstack __P((const struct osf1_sigaltstack *, struct sigaltstack *));
-void osf1_to_bsd_sigset __P((const osf1_sigset_t *, sigset_t *));
-void osf1_sendsig __P((sig_t, int , sigset_t *, u_long ));
+void bsd_to_osf1_sigaltstack(const struct sigaltstack *, struct osf1_sigaltstack *);
+void bsd_to_osf1_sigset(const sigset_t *, osf1_sigset_t *);
+void osf1_to_bsd_sigaltstack(const struct osf1_sigaltstack *, struct sigaltstack *);
+void osf1_to_bsd_sigset(const osf1_sigset_t *, sigset_t *);
+void osf1_sendsig(sig_t, int , sigset_t *, u_long );
 
 
 #endif /* !_OSF1_SIGNAL_H */
diff --git a/sys/alpha/osf1/osf1_sysvec.c b/sys/alpha/osf1/osf1_sysvec.c
index e8a31f2..f073712 100644
--- a/sys/alpha/osf1/osf1_sysvec.c
+++ b/sys/alpha/osf1/osf1_sysvec.c
@@ -59,8 +59,7 @@ MODULE_DEPEND(osf1, sysvshm, 1, 1, 1);
 
 int osf1_szsigcode;
 extern char sigcode[];
-static int osf1_freebsd_fixup __P((long **stack_base,
-				   struct image_params *imgp));
+static int osf1_freebsd_fixup(long **stack_base, struct image_params *imgp);
 
 struct sysentvec osf1_sysvec = {
 	OSF1_SYS_MAXSYSCALL,
diff --git a/sys/alpha/osf1/osf1_util.h b/sys/alpha/osf1/osf1_util.h
index 1df4fbc..7b97467 100644
--- a/sys/alpha/osf1/osf1_util.h
+++ b/sys/alpha/osf1/osf1_util.h
@@ -66,8 +66,8 @@ stackgap_alloc(sgp, sz)
 
 
 extern const char osf1_emul_path[];
-int osf1_emul_find __P((struct thread *, caddr_t *, const char *, char *,
-			char **, int));
+int osf1_emul_find(struct thread *, caddr_t *, const char *, char *,
+			char **, int);
 
 #define CHECKALT(p, sgp, path, i)					\
 	do {								\