Remove __P.

16 files changed, 195 insertions, 196 deletions

diff --git a/sys/amd64/include/clock.h b/sys/amd64/include/clock.h
index 20bd09d..38179a6 100644
--- a/sys/amd64/include/clock.h
+++ b/sys/amd64/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/amd64/include/cpu.h b/sys/amd64/include/cpu.h
index 10b9499..06c191b 100644
--- a/sys/amd64/include/cpu.h
+++ b/sys/amd64/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/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h
index a28e9a7..02a24a3 100644
--- a/sys/amd64/include/cpufunc.h
+++ b/sys/amd64/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/amd64/include/fpu.h b/sys/amd64/include/fpu.h
index 589a4be..4746f5c 100644
--- a/sys/amd64/include/fpu.h
+++ b/sys/amd64/include/fpu.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/amd64/include/frame.h b/sys/amd64/include/frame.h
index 0cfff1a..c32afc4 100644
--- a/sys/amd64/include/frame.h
+++ b/sys/amd64/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/amd64/include/md_var.h b/sys/amd64/include/md_var.h
index ab47a94..4c91d13 100644
--- a/sys/amd64/include/md_var.h
+++ b/sys/amd64/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/amd64/include/npx.h b/sys/amd64/include/npx.h
index 589a4be..4746f5c 100644
--- a/sys/amd64/include/npx.h
+++ b/sys/amd64/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/amd64/include/pcb.h b/sys/amd64/include/pcb.h
index d4a375a..b2f1bc4 100644
--- a/sys/amd64/include/pcb.h
+++ b/sys/amd64/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/amd64/include/pcb_ext.h b/sys/amd64/include/pcb_ext.h
index 3256f99..cf5a911 100644
--- a/sys/amd64/include/pcb_ext.h
+++ b/sys/amd64/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/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index 7358a9e..7348b67 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/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/amd64/include/proc.h b/sys/amd64/include/proc.h
index 5b50824..f011b5c 100644
--- a/sys/amd64/include/proc.h
+++ b/sys/amd64/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/amd64/include/profile.h b/sys/amd64/include/profile.h
index bd8a7da..a00f475 100644
--- a/sys/amd64/include/profile.h
+++ b/sys/amd64/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/amd64/include/reg.h b/sys/amd64/include/reg.h
index 3f3c774..ca15fb2 100644
--- a/sys/amd64/include/reg.h
+++ b/sys/amd64/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/amd64/include/segments.h b/sys/amd64/include/segments.h
index d671e12..3e47fa8 100644
--- a/sys/amd64/include/segments.h
+++ b/sys/amd64/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/amd64/include/smp.h b/sys/amd64/include/smp.h
index 34228e2..3a57c00 100644
--- a/sys/amd64/include/smp.h
+++ b/sys/amd64/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/amd64/include/sysarch.h b/sys/amd64/include/sysarch.h
index eb65000..6ce9768 100644
--- a/sys/amd64/include/sysarch.h
+++ b/sys/amd64/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