Remove __P.

12 files changed, 86 insertions, 86 deletions

diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index af2cb5f..232f629 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -91,9 +91,9 @@
 device_t isa_bus_device = 0;
 #endif
 
-static void	configure_first __P((void *));
-static void	configure __P((void *));
-static void	configure_final __P((void *));
+static void	configure_first(void *);
+static void	configure(void *);
+static void	configure_final(void *);
 
 #if defined(NFSCLIENT) && defined(NFS_ROOT) && !defined(BOOTP_NFSROOT)
 static void	pxe_setup_nfsdiskless(void);
diff --git a/sys/amd64/amd64/db_disasm.c b/sys/amd64/amd64/db_disasm.c
index e742764..43e6d1f 100644
--- a/sys/amd64/amd64/db_disasm.c
+++ b/sys/amd64/amd64/db_disasm.c
@@ -861,13 +861,13 @@ static const int db_lengths[] = {
 	(loc) += (size);
 
 static db_addr_t
-		db_disasm_esc __P((db_addr_t loc, int inst, int short_addr,
-				   int size, const char *seg));
-static void	db_print_address __P((const char *seg, int size,
-				      struct i_addr *addrp));
+		db_disasm_esc(db_addr_t loc, int inst, int short_addr,
+				   int size, const char *seg);
+static void	db_print_address(const char *seg, int size,
+				      struct i_addr *addrp);
 static db_addr_t
-		db_read_address __P((db_addr_t loc, int short_addr,
-				     int regmodrm, struct i_addr *addrp));
+		db_read_address(db_addr_t loc, int short_addr,
+				     int regmodrm, struct i_addr *addrp);
 
 /*
  * Read address at location and return updated location.
diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c
index bb5a5b1..2ba81da 100644
--- a/sys/amd64/amd64/db_interface.c
+++ b/sys/amd64/amd64/db_interface.c
@@ -52,7 +52,7 @@
 static jmp_buf *db_nofault = 0;
 extern jmp_buf	db_jmpbuf;
 
-extern void	gdb_handle_exception __P((db_regs_t *, int, int));
+extern void	gdb_handle_exception(db_regs_t *, int, int);
 
 int	db_active;
 db_regs_t ddb_regs;
diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c
index 6a07631..c9324e7 100644
--- a/sys/amd64/amd64/db_trace.c
+++ b/sys/amd64/amd64/db_trace.c
@@ -104,19 +104,19 @@ struct i386_frame {
 #define	INTERRUPT	2
 #define	SYSCALL		3
 
-static void db_nextframe __P((struct i386_frame **, db_addr_t *, struct proc *));
-static int db_numargs __P((struct i386_frame *));
-static void db_print_stack_entry __P((const char *, int, char **, int *, db_addr_t));
-static void decode_syscall __P((int, struct proc *));
-
-
-static char * watchtype_str __P((int type));
-int  i386_set_watch         __P((int watchnum, unsigned int watchaddr, 
-                                 int size, int access, struct dbreg * d));
-int  i386_clr_watch         __P((int watchnum, struct dbreg * d));
-int  db_md_set_watchpoint   __P((db_expr_t addr, db_expr_t size));
-int  db_md_clr_watchpoint   __P((db_expr_t addr, db_expr_t size));
-void db_md_list_watchpoints __P((void));
+static void db_nextframe(struct i386_frame **, db_addr_t *, struct proc *);
+static int db_numargs(struct i386_frame *);
+static void db_print_stack_entry(const char *, int, char **, int *, db_addr_t);
+static void decode_syscall(int, struct proc *);
+
+
+static char * watchtype_str(int type);
+int  i386_set_watch(int watchnum, unsigned int watchaddr, 
+                                 int size, int access, struct dbreg * d);
+int  i386_clr_watch(int watchnum, struct dbreg * d);
+int  db_md_set_watchpoint(db_expr_t addr, db_expr_t size);
+int  db_md_clr_watchpoint(db_expr_t addr, db_expr_t size);
+void db_md_list_watchpoints(void);
 
 
 /*
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 5859004..ff8f10c 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -119,8 +119,8 @@
 #include <sys/ptrace.h>
 #include <machine/sigframe.h>
 
-extern void init386 __P((int first));
-extern void dblfault_handler __P((void));
+extern void init386(int first);
+extern void dblfault_handler(void);
 
 extern void printcpuinfo(void);	/* XXX header file */
 extern void earlysetcpuclass(void);	/* same header file */
@@ -131,10 +131,10 @@ extern void initializecpu(void);
 #define	CS_SECURE(cs)		(ISPL(cs) == SEL_UPL)
 #define	EFL_SECURE(ef, oef)	((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0)
 
-static void cpu_startup __P((void *));
+static void cpu_startup(void *);
 #ifdef CPU_ENABLE_SSE
-static void set_fpregs_xmm __P((struct save87 *, struct savexmm *));
-static void fill_fpregs_xmm __P((struct savexmm *, struct save87 *));
+static void set_fpregs_xmm(struct save87 *, struct savexmm *);
+static void fill_fpregs_xmm(struct savexmm *, struct save87 *);
 #endif /* CPU_ENABLE_SSE */
 SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL)
 
@@ -160,7 +160,7 @@ int physmem = 0;
 int cold = 1;
 
 #ifdef COMPAT_43
-static void osendsig __P((sig_t catcher, int sig, sigset_t *mask, u_long code));
+static void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code);
 #endif
 
 static int
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index e3dd31a..9643191 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -737,11 +737,11 @@ static io_int  *io_apic_ints;
 
 static int nintrs;
 
-static int processor_entry	__P((proc_entry_ptr entry, int cpu));
-static int bus_entry		__P((bus_entry_ptr entry, int bus));
-static int io_apic_entry	__P((io_apic_entry_ptr entry, int apic));
-static int int_entry		__P((int_entry_ptr entry, int intr));
-static int lookup_bus_type	__P((char *name));
+static int processor_entry	(proc_entry_ptr entry, int cpu);
+static int bus_entry		(bus_entry_ptr entry, int bus);
+static int io_apic_entry	(io_apic_entry_ptr entry, int apic);
+static int int_entry		(int_entry_ptr entry, int intr);
+static int lookup_bus_type	(char *name);
 
 
 /*
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index e3dd31a..9643191 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -737,11 +737,11 @@ static io_int  *io_apic_ints;
 
 static int nintrs;
 
-static int processor_entry	__P((proc_entry_ptr entry, int cpu));
-static int bus_entry		__P((bus_entry_ptr entry, int bus));
-static int io_apic_entry	__P((io_apic_entry_ptr entry, int apic));
-static int int_entry		__P((int_entry_ptr entry, int intr));
-static int lookup_bus_type	__P((char *name));
+static int processor_entry	(proc_entry_ptr entry, int cpu);
+static int bus_entry		(bus_entry_ptr entry, int bus);
+static int io_apic_entry	(io_apic_entry_ptr entry, int apic);
+static int int_entry		(int_entry_ptr entry, int intr);
+static int lookup_bus_type	(char *name);
 
 
 /*
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 59192c5..cd4a914 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -194,30 +194,30 @@ extern pt_entry_t *SMPpt;
 static pt_entry_t *PMAP1 = 0;
 static pt_entry_t *PADDR1 = 0;
 
-static PMAP_INLINE void	free_pv_entry __P((pv_entry_t pv));
-static pt_entry_t *get_ptbase __P((pmap_t pmap));
-static pv_entry_t get_pv_entry __P((void));
-static void	i386_protection_init __P((void));
-static __inline void	pmap_changebit __P((vm_page_t m, int bit, boolean_t setem));
-
-static void	pmap_remove_all __P((vm_page_t m));
-static vm_page_t pmap_enter_quick __P((pmap_t pmap, vm_offset_t va,
-				      vm_page_t m, vm_page_t mpte));
-static int pmap_remove_pte __P((pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva));
-static void pmap_remove_page __P((struct pmap *pmap, vm_offset_t va));
-static int pmap_remove_entry __P((struct pmap *pmap, vm_page_t m,
-					vm_offset_t va));
-static boolean_t pmap_testbit __P((vm_page_t m, int bit));
-static void pmap_insert_entry __P((pmap_t pmap, vm_offset_t va,
-		vm_page_t mpte, vm_page_t m));
-
-static vm_page_t pmap_allocpte __P((pmap_t pmap, vm_offset_t va));
-
-static int pmap_release_free_page __P((pmap_t pmap, vm_page_t p));
-static vm_page_t _pmap_allocpte __P((pmap_t pmap, unsigned ptepindex));
-static pt_entry_t *pmap_pte_quick __P((pmap_t pmap, vm_offset_t va));
-static vm_page_t pmap_page_lookup __P((vm_object_t object, vm_pindex_t pindex));
-static int pmap_unuse_pt __P((pmap_t, vm_offset_t, vm_page_t));
+static PMAP_INLINE void	free_pv_entry(pv_entry_t pv);
+static pt_entry_t *get_ptbase(pmap_t pmap);
+static pv_entry_t get_pv_entry(void);
+static void	i386_protection_init(void);
+static __inline void	pmap_changebit(vm_page_t m, int bit, boolean_t setem);
+
+static void	pmap_remove_all(vm_page_t m);
+static vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va,
+				      vm_page_t m, vm_page_t mpte);
+static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva);
+static void pmap_remove_page(struct pmap *pmap, vm_offset_t va);
+static int pmap_remove_entry(struct pmap *pmap, vm_page_t m,
+					vm_offset_t va);
+static boolean_t pmap_testbit(vm_page_t m, int bit);
+static void pmap_insert_entry(pmap_t pmap, vm_offset_t va,
+		vm_page_t mpte, vm_page_t m);
+
+static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va);
+
+static int pmap_release_free_page(pmap_t pmap, vm_page_t p);
+static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex);
+static pt_entry_t *pmap_pte_quick(pmap_t pmap, vm_offset_t va);
+static vm_page_t pmap_page_lookup(vm_object_t object, vm_pindex_t pindex);
+static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t);
 static vm_offset_t pmap_kmem_choose(vm_offset_t addr);
 static void *pmap_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait);
 
@@ -3555,8 +3555,8 @@ pmap_pid_dump(int pid)
 
 #if defined(DEBUG)
 
-static void	pads __P((pmap_t pm));
-void		pmap_pvdump __P((vm_offset_t pa));
+static void	pads(pmap_t pm);
+void		pmap_pvdump(vm_offset_t pa);
 
 /* print address space of pmap*/
 static void
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index 58e1a22..ba47686 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -66,12 +66,12 @@
 
 
 
-static int i386_get_ldt	__P((struct thread *, char *));
-static int i386_set_ldt	__P((struct thread *, char *));
-static int i386_get_ioperm	__P((struct thread *, char *));
-static int i386_set_ioperm	__P((struct thread *, char *));
+static int i386_get_ldt	(struct thread *, char *);
+static int i386_set_ldt	(struct thread *, char *);
+static int i386_get_ioperm	(struct thread *, char *);
+static int i386_set_ioperm	(struct thread *, char *);
 #ifdef SMP
-static void set_user_ldt_rv	__P((struct thread *));
+static void set_user_ldt_rv	(struct thread *);
 #endif
 
 #ifndef _SYS_SYSPROTO_H_
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index a454803..57d1dea 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -100,17 +100,17 @@
 
 #include <sys/sysctl.h>
 
-int (*pmath_emulate) __P((struct trapframe *));
+int (*pmath_emulate)(struct trapframe *);
 
-extern void trap __P((struct trapframe frame));
+extern void trap(struct trapframe frame);
 #ifdef I386_CPU
-extern int trapwrite __P((unsigned addr));
+extern int trapwrite(unsigned addr);
 #endif
-extern void syscall __P((struct trapframe frame));
+extern void syscall(struct trapframe frame);
 
-static int trap_pfault __P((struct trapframe *, int, vm_offset_t));
-static void trap_fatal __P((struct trapframe *, vm_offset_t));
-void dblfault_handler __P((void));
+static int trap_pfault(struct trapframe *, int, vm_offset_t);
+static void trap_fatal(struct trapframe *, vm_offset_t);
+void dblfault_handler(void);
 
 extern inthand_t IDTVEC(lcall_syscall);
 
@@ -166,7 +166,7 @@ extern char *syscallnames[];
 
 #ifdef DEVICE_POLLING
 extern u_int32_t poll_in_trap;
-extern int ether_poll __P((int count));
+extern int ether_poll(int count);
 #endif /* DEVICE_POLLING */
 
 /*
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index 01e4b30..cc4c37a 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -86,9 +86,9 @@
 #include <i386/isa/isa.h>
 #endif
 
-static void	cpu_reset_real __P((void));
+static void	cpu_reset_real(void);
 #ifdef SMP
-static void	cpu_reset_proxy __P((void));
+static void	cpu_reset_proxy(void);
 static u_int	cpu_reset_proxyid;
 static volatile u_int	cpu_reset_proxy_active;
 #endif
@@ -241,7 +241,7 @@ cpu_fork(td1, p2, td2, flags)
 void
 cpu_set_fork_handler(td, func, arg)
 	struct thread *td;
-	void (*func) __P((void *));
+	void (*func)(void *);
 	void *arg;
 {
 	/*
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index e3dd31a..9643191 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -737,11 +737,11 @@ static io_int  *io_apic_ints;
 
 static int nintrs;
 
-static int processor_entry	__P((proc_entry_ptr entry, int cpu));
-static int bus_entry		__P((bus_entry_ptr entry, int bus));
-static int io_apic_entry	__P((io_apic_entry_ptr entry, int apic));
-static int int_entry		__P((int_entry_ptr entry, int intr));
-static int lookup_bus_type	__P((char *name));
+static int processor_entry	(proc_entry_ptr entry, int cpu);
+static int bus_entry		(bus_entry_ptr entry, int bus);
+static int io_apic_entry	(io_apic_entry_ptr entry, int apic);
+static int int_entry		(int_entry_ptr entry, int intr);
+static int lookup_bus_type	(char *name);
 
 
 /*