diff --git a/sys/amd64/include/clock.h b/sys/amd64/include/clock.h index 20bd09d22b0d..38179a6b1306 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 10b94993b374..06c191b402ac 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 a28e9a769ef5..02a24a315be9 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 589a4be18997..4746f5cefda3 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 0cfff1aead71..c32afc4b8a7f 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 ab47a94bd11a..4c91d13de0c7 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 589a4be18997..4746f5cefda3 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 d4a375a20788..b2f1bc43a9cf 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 3256f9929175..cf5a9119416c 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 7358a9e41223..7348b67a3e95 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 5b50824f824f..f011b5c37149 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 bd8a7da017a9..a00f475ede28 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 3f3c774e74c3..ca15fb267ee9 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 d671e1230f7a..3e47fa83d4d6 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 34228e238793..3a57c0092ee8 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 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 __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 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 eb6500010b66..6ce9768ea4ba 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 diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c index 2a09fd36a852..6e8d0b1f899d 100644 --- a/sys/compat/linux/linux_getcwd.c +++ b/sys/compat/linux/linux_getcwd.c @@ -60,11 +60,11 @@ #include static int -linux_getcwd_scandir __P((struct vnode **, struct vnode **, - char **, char *, struct thread *)); +linux_getcwd_scandir(struct vnode **, struct vnode **, + char **, char *, struct thread *); static int -linux_getcwd_common __P((struct vnode *, struct vnode *, - char **, char *, int, int, struct thread *)); +linux_getcwd_common(struct vnode *, struct vnode *, + char **, char *, int, int, struct thread *); #define DIRENT_MINSIZE (sizeof(struct dirent) - (MAXNAMLEN+1) + 4) diff --git a/sys/compat/linux/linux_ipc.h b/sys/compat/linux/linux_ipc.h index a647b4b96d58..183afe10244a 100644 --- a/sys/compat/linux/linux_ipc.h +++ b/sys/compat/linux/linux_ipc.h @@ -112,19 +112,19 @@ struct linux_shmget_args l_int shmflg; }; -int linux_msgctl __P((struct thread *, struct linux_msgctl_args *)); -int linux_msgget __P((struct thread *, struct linux_msgget_args *)); -int linux_msgrcv __P((struct thread *, struct linux_msgrcv_args *)); -int linux_msgsnd __P((struct thread *, struct linux_msgsnd_args *)); +int linux_msgctl(struct thread *, struct linux_msgctl_args *); +int linux_msgget(struct thread *, struct linux_msgget_args *); +int linux_msgrcv(struct thread *, struct linux_msgrcv_args *); +int linux_msgsnd(struct thread *, struct linux_msgsnd_args *); -int linux_semctl __P((struct thread *, struct linux_semctl_args *)); -int linux_semget __P((struct thread *, struct linux_semget_args *)); -int linux_semop __P((struct thread *, struct linux_semop_args *)); +int linux_semctl(struct thread *, struct linux_semctl_args *); +int linux_semget(struct thread *, struct linux_semget_args *); +int linux_semop(struct thread *, struct linux_semop_args *); -int linux_shmat __P((struct thread *, struct linux_shmat_args *)); -int linux_shmctl __P((struct thread *, struct linux_shmctl_args *)); -int linux_shmdt __P((struct thread *, struct linux_shmdt_args *)); -int linux_shmget __P((struct thread *, struct linux_shmget_args *)); +int linux_shmat(struct thread *, struct linux_shmat_args *); +int linux_shmctl(struct thread *, struct linux_shmctl_args *); +int linux_shmdt(struct thread *, struct linux_shmdt_args *); +int linux_shmget(struct thread *, struct linux_shmget_args *); #endif /* __i386__ */ diff --git a/sys/compat/linux/linux_mib.h b/sys/compat/linux/linux_mib.h index 4bed66746729..079efc01c7e4 100644 --- a/sys/compat/linux/linux_mib.h +++ b/sys/compat/linux/linux_mib.h @@ -31,13 +31,13 @@ #ifndef _LINUX_MIB_H_ #define _LINUX_MIB_H_ -void linux_get_osname __P((struct proc *p, char *dst)); -int linux_set_osname __P((struct proc *p, char *osname)); +void linux_get_osname (struct proc *p, char *dst); +int linux_set_osname (struct proc *p, char *osname); -void linux_get_osrelease __P((struct proc *p, char *dst)); -int linux_set_osrelease __P((struct proc *p, char *osrelease)); +void linux_get_osrelease (struct proc *p, char *dst); +int linux_set_osrelease (struct proc *p, char *osrelease); -int linux_get_oss_version __P((struct proc *p)); -int linux_set_oss_version __P((struct proc *p, int oss_version)); +int linux_get_oss_version (struct proc *p); +int linux_set_oss_version (struct proc *p, int oss_version); #endif /* _LINUX_MIB_H_ */ diff --git a/sys/compat/linux/linux_signal.h b/sys/compat/linux/linux_signal.h index 8d0825bbaae4..edb7c66b2692 100644 --- a/sys/compat/linux/linux_signal.h +++ b/sys/compat/linux/linux_signal.h @@ -31,9 +31,8 @@ #ifndef _LINUX_SIGNAL_H_ #define _LINUX_SIGNAL_H_ -void linux_to_bsd_sigset __P((l_sigset_t *, sigset_t *)); -void bsd_to_linux_sigset __P((sigset_t *, l_sigset_t *)); -int linux_do_sigaction __P((struct thread *, int, l_sigaction_t *, - l_sigaction_t *)); +void linux_to_bsd_sigset(l_sigset_t *, sigset_t *); +void bsd_to_linux_sigset(sigset_t *, l_sigset_t *); +int linux_do_sigaction(struct thread *, int, l_sigaction_t *, l_sigaction_t *); #endif /* _LINUX_SIGNAL_H_ */ diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h index bc020464c8b3..ee421a2927c2 100644 --- a/sys/compat/linux/linux_util.h +++ b/sys/compat/linux/linux_util.h @@ -74,7 +74,7 @@ stackgap_alloc(sgp, sz) extern const char linux_emul_path[]; -int linux_emul_find __P((struct thread *, caddr_t *, char *, char **, int)); +int linux_emul_find(struct thread *, caddr_t *, char *, char **, int); #define CHECKALT(p, sgp, path, i) \ do { \ diff --git a/sys/compat/netbsd/dvcfg.h b/sys/compat/netbsd/dvcfg.h index 3edc1cb2d690..5485f89faa43 100644 --- a/sys/compat/netbsd/dvcfg.h +++ b/sys/compat/netbsd/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/compat/netbsd/physio_proc.h b/sys/compat/netbsd/physio_proc.h index b034e9a1ffbf..74848a434903 100644 --- a/sys/compat/netbsd/physio_proc.h +++ b/sys/compat/netbsd/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/compat/svr4/imgact_svr4.c b/sys/compat/svr4/imgact_svr4.c index 02ce42fda696..0e0b46434cb3 100644 --- a/sys/compat/svr4/imgact_svr4.c +++ b/sys/compat/svr4/imgact_svr4.c @@ -54,7 +54,7 @@ #include -static int exec_svr4_imgact __P((struct image_params *iparams)); +static int exec_svr4_imgact(struct image_params *iparams); static int exec_svr4_imgact(imgp) diff --git a/sys/compat/svr4/svr4_exec.h b/sys/compat/svr4/svr4_exec.h index f15211bc1fb7..5d35f19b1eea 100644 --- a/sys/compat/svr4/svr4_exec.h +++ b/sys/compat/svr4/svr4_exec.h @@ -65,6 +65,6 @@ #endif #endif -/*void svr4_setregs __P((struct thread *, struct exec_package *, u_long));*/ +/*void svr4_setregs(struct thread *, struct exec_package *, u_long);*/ #endif /* !_SVR4_EXEC_H_ */ diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c index 394b1d542fa1..fd20dde266f5 100644 --- a/sys/compat/svr4/svr4_fcntl.c +++ b/sys/compat/svr4/svr4_fcntl.c @@ -53,15 +53,15 @@ #include #include -static int svr4_to_bsd_flags __P((int)); -static u_long svr4_to_bsd_cmd __P((u_long)); -static int fd_revoke __P((struct thread *, int)); -static int fd_truncate __P((struct thread *, int, struct flock *)); -static int bsd_to_svr4_flags __P((int)); -static void bsd_to_svr4_flock __P((struct flock *, struct svr4_flock *)); -static void svr4_to_bsd_flock __P((struct svr4_flock *, struct flock *)); -static void bsd_to_svr4_flock64 __P((struct flock *, struct svr4_flock64 *)); -static void svr4_to_bsd_flock64 __P((struct svr4_flock64 *, struct flock *)); +static int svr4_to_bsd_flags(int); +static u_long svr4_to_bsd_cmd(u_long); +static int fd_revoke(struct thread *, int); +static int fd_truncate(struct thread *, int, struct flock *); +static int bsd_to_svr4_flags(int); +static void bsd_to_svr4_flock(struct flock *, struct svr4_flock *); +static void svr4_to_bsd_flock(struct svr4_flock *, struct flock *); +static void bsd_to_svr4_flock64(struct flock *, struct svr4_flock64 *); +static void svr4_to_bsd_flock64(struct svr4_flock64 *, struct flock *); static u_long svr4_to_bsd_cmd(cmd) diff --git a/sys/compat/svr4/svr4_ioctl.c b/sys/compat/svr4/svr4_ioctl.c index cbac6318ab8f..50d28ee55bde 100644 --- a/sys/compat/svr4/svr4_ioctl.c +++ b/sys/compat/svr4/svr4_ioctl.c @@ -50,7 +50,7 @@ #include #ifdef DEBUG_SVR4 -static void svr4_decode_cmd __P((u_long, char *, char *, int *, int *)); +static void svr4_decode_cmd(u_long, char *, char *, int *, int *); /* * Decode an ioctl command symbolically */ @@ -85,8 +85,8 @@ svr4_sys_ioctl(td, uap) int *retval; struct file *fp; u_long cmd; - int (*fun) __P((struct file *, struct thread *, register_t *, - int, u_long, caddr_t)); + int (*fun)(struct file *, struct thread *, register_t *, + int, u_long, caddr_t); int error; #ifdef DEBUG_SVR4 char dir[4]; diff --git a/sys/compat/svr4/svr4_ioctl.h b/sys/compat/svr4/svr4_ioctl.h index 2d7e13608165..54811b9ee138 100644 --- a/sys/compat/svr4/svr4_ioctl.h +++ b/sys/compat/svr4/svr4_ioctl.h @@ -46,17 +46,17 @@ #define SVR4_IOW(g,n,t) SVR4_IOC(SVR4_IOC_IN, (g), (n), sizeof(t)) #define SVR4_IOWR(g,n,t) SVR4_IOC(SVR4_IOC_INOUT,(g), (n), sizeof(t)) -int svr4_stream_ti_ioctl __P((struct file *, struct thread *, register_t *, - int, u_long, caddr_t)); -int svr4_stream_ioctl __P((struct file *, struct thread *, register_t *, - int, u_long, caddr_t)); -int svr4_term_ioctl __P((struct file *, struct thread *, register_t *, - int, u_long, caddr_t)); -int svr4_ttold_ioctl __P((struct file *, struct thread *, register_t *, - int, u_long, caddr_t)); -int svr4_fil_ioctl __P((struct file *, struct thread *, register_t *, - int, u_long, caddr_t)); -int svr4_sock_ioctl __P((struct file *, struct thread *, register_t *, - int, u_long, caddr_t)); +int svr4_stream_ti_ioctl(struct file *, struct thread *, register_t *, + int, u_long, caddr_t); +int svr4_stream_ioctl(struct file *, struct thread *, register_t *, + int, u_long, caddr_t); +int svr4_term_ioctl(struct file *, struct thread *, register_t *, + int, u_long, caddr_t); +int svr4_ttold_ioctl(struct file *, struct thread *, register_t *, + int, u_long, caddr_t); +int svr4_fil_ioctl (struct file *, struct thread *, register_t *, + int, u_long, caddr_t); +int svr4_sock_ioctl (struct file *, struct thread *, register_t *, + int, u_long, caddr_t); #endif /* !_SVR4_IOCTL_H_ */ diff --git a/sys/compat/svr4/svr4_ipc.c b/sys/compat/svr4/svr4_ipc.c index dd86bd8fc2e2..17caaa5124a2 100644 --- a/sys/compat/svr4/svr4_ipc.c +++ b/sys/compat/svr4/svr4_ipc.c @@ -90,44 +90,44 @@ #include #if defined(SYSVMSG) || defined(SYSVSHM) || defined(SYSVSEM) -static void svr4_to_bsd_ipc_perm __P((const struct svr4_ipc_perm *, - struct ipc_perm *)); -static void bsd_to_svr4_ipc_perm __P((const struct ipc_perm *, - struct svr4_ipc_perm *)); +static void svr4_to_bsd_ipc_perm(const struct svr4_ipc_perm *, + struct ipc_perm *); +static void bsd_to_svr4_ipc_perm(const struct ipc_perm *, + struct svr4_ipc_perm *); #endif #ifdef SYSVSEM -static void bsd_to_svr4_semid_ds __P((const struct semid_ds *, - struct svr4_semid_ds *)); -static void svr4_to_bsd_semid_ds __P((const struct svr4_semid_ds *, - struct semid_ds *)); -static int svr4_setsemun __P((caddr_t *sgp, union semun **argp, - union semun *usp)); -static int svr4_semop __P((struct proc *, void *, register_t *)); -static int svr4_semget __P((struct proc *, void *, register_t *)); -static int svr4_semctl __P((struct proc *, void *, register_t *)); +static void bsd_to_svr4_semid_ds(const struct semid_ds *, + struct svr4_semid_ds *); +static void svr4_to_bsd_semid_ds(const struct svr4_semid_ds *, + struct semid_ds *); +static int svr4_setsemun(caddr_t *sgp, union semun **argp, + union semun *usp); +static int svr4_semop(struct proc *, void *, register_t *); +static int svr4_semget(struct proc *, void *, register_t *); +static int svr4_semctl(struct proc *, void *, register_t *); #endif #ifdef SYSVMSG -static void bsd_to_svr4_msqid_ds __P((const struct msqid_ds *, - struct svr4_msqid_ds *)); -static void svr4_to_bsd_msqid_ds __P((const struct svr4_msqid_ds *, - struct msqid_ds *)); -static int svr4_msgsnd __P((struct proc *, void *, register_t *)); -static int svr4_msgrcv __P((struct proc *, void *, register_t *)); -static int svr4_msgget __P((struct proc *, void *, register_t *)); -static int svr4_msgctl __P((struct proc *, void *, register_t *)); +static void bsd_to_svr4_msqid_ds(const struct msqid_ds *, + struct svr4_msqid_ds *); +static void svr4_to_bsd_msqid_ds(const struct svr4_msqid_ds *, + struct msqid_ds *); +static int svr4_msgsnd(struct proc *, void *, register_t *); +static int svr4_msgrcv(struct proc *, void *, register_t *); +static int svr4_msgget(struct proc *, void *, register_t *); +static int svr4_msgctl(struct proc *, void *, register_t *); #endif #ifdef SYSVSHM -static void bsd_to_svr4_shmid_ds __P((const struct shmid_ds *, - struct svr4_shmid_ds *)); -static void svr4_to_bsd_shmid_ds __P((const struct svr4_shmid_ds *, - struct shmid_ds *)); -static int svr4_shmat __P((struct proc *, void *, register_t *)); -static int svr4_shmdt __P((struct proc *, void *, register_t *)); -static int svr4_shmget __P((struct proc *, void *, register_t *)); -static int svr4_shmctl __P((struct proc *, void *, register_t *)); +static void bsd_to_svr4_shmid_ds(const struct shmid_ds *, + struct svr4_shmid_ds *); +static void svr4_to_bsd_shmid_ds(const struct svr4_shmid_ds *, + struct shmid_ds *); +static int svr4_shmat(struct proc *, void *, register_t *); +static int svr4_shmdt(struct proc *, void *, register_t *); +static int svr4_shmget(struct proc *, void *, register_t *); +static int svr4_shmctl(struct proc *, void *, register_t *); #endif #if defined(SYSVMSG) || defined(SYSVSHM) || defined(SYSVSEM) diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c index 40a12c63f6b5..14c7cba981c1 100644 --- a/sys/compat/svr4/svr4_misc.c +++ b/sys/compat/svr4/svr4_misc.c @@ -95,20 +95,20 @@ #define BSD_DIRENT(cp) ((struct dirent *)(cp)) -static int svr4_mknod __P((struct thread *, register_t *, char *, - svr4_mode_t, svr4_dev_t)); +static int svr4_mknod(struct thread *, register_t *, char *, + svr4_mode_t, svr4_dev_t); -static __inline clock_t timeval_to_clock_t __P((struct timeval *)); -static int svr4_setinfo __P((struct proc *, int, svr4_siginfo_t *)); +static __inline clock_t timeval_to_clock_t(struct timeval *); +static int svr4_setinfo (struct proc *, int, svr4_siginfo_t *); struct svr4_hrtcntl_args; -static int svr4_hrtcntl __P((struct thread *, struct svr4_hrtcntl_args *, - register_t *)); -static void bsd_statfs_to_svr4_statvfs __P((const struct statfs *, - struct svr4_statvfs *)); -static void bsd_statfs_to_svr4_statvfs64 __P((const struct statfs *, - struct svr4_statvfs64 *)); -static struct proc *svr4_pfind __P((pid_t pid)); +static int svr4_hrtcntl (struct thread *, struct svr4_hrtcntl_args *, + register_t *); +static void bsd_statfs_to_svr4_statvfs(const struct statfs *, + struct svr4_statvfs *); +static void bsd_statfs_to_svr4_statvfs64(const struct statfs *, + struct svr4_statvfs64 *); +static struct proc *svr4_pfind(pid_t pid); /* BOGUS noop */ #if defined(BOGUS) diff --git a/sys/compat/svr4/svr4_proto.h b/sys/compat/svr4/svr4_proto.h index d2a862fc9508..15f66de4cc1c 100644 --- a/sys/compat/svr4/svr4_proto.h +++ b/sys/compat/svr4/svr4_proto.h @@ -383,86 +383,86 @@ struct svr4_sys_sendto_args { struct sockaddr * to; char to_[PAD_(struct sockaddr *)]; int tolen; char tolen_[PAD_(int)]; }; -int svr4_sys_open __P((struct thread *, struct svr4_sys_open_args *)); -int svr4_sys_wait __P((struct thread *, struct svr4_sys_wait_args *)); -int svr4_sys_creat __P((struct thread *, struct svr4_sys_creat_args *)); -int svr4_sys_execv __P((struct thread *, struct svr4_sys_execv_args *)); -int svr4_sys_time __P((struct thread *, struct svr4_sys_time_args *)); -int svr4_sys_mknod __P((struct thread *, struct svr4_sys_mknod_args *)); -int svr4_sys_break __P((struct thread *, struct svr4_sys_break_args *)); -int svr4_sys_stat __P((struct thread *, struct svr4_sys_stat_args *)); -int svr4_sys_alarm __P((struct thread *, struct svr4_sys_alarm_args *)); -int svr4_sys_fstat __P((struct thread *, struct svr4_sys_fstat_args *)); -int svr4_sys_pause __P((struct thread *, struct svr4_sys_pause_args *)); -int svr4_sys_utime __P((struct thread *, struct svr4_sys_utime_args *)); -int svr4_sys_access __P((struct thread *, struct svr4_sys_access_args *)); -int svr4_sys_nice __P((struct thread *, struct svr4_sys_nice_args *)); -int svr4_sys_kill __P((struct thread *, struct svr4_sys_kill_args *)); -int svr4_sys_pgrpsys __P((struct thread *, struct svr4_sys_pgrpsys_args *)); -int svr4_sys_times __P((struct thread *, struct svr4_sys_times_args *)); -int svr4_sys_signal __P((struct thread *, struct svr4_sys_signal_args *)); +int svr4_sys_open(struct thread *, struct svr4_sys_open_args *); +int svr4_sys_wait(struct thread *, struct svr4_sys_wait_args *); +int svr4_sys_creat(struct thread *, struct svr4_sys_creat_args *); +int svr4_sys_execv(struct thread *, struct svr4_sys_execv_args *); +int svr4_sys_time(struct thread *, struct svr4_sys_time_args *); +int svr4_sys_mknod(struct thread *, struct svr4_sys_mknod_args *); +int svr4_sys_break(struct thread *, struct svr4_sys_break_args *); +int svr4_sys_stat(struct thread *, struct svr4_sys_stat_args *); +int svr4_sys_alarm(struct thread *, struct svr4_sys_alarm_args *); +int svr4_sys_fstat(struct thread *, struct svr4_sys_fstat_args *); +int svr4_sys_pause(struct thread *, struct svr4_sys_pause_args *); +int svr4_sys_utime(struct thread *, struct svr4_sys_utime_args *); +int svr4_sys_access(struct thread *, struct svr4_sys_access_args *); +int svr4_sys_nice(struct thread *, struct svr4_sys_nice_args *); +int svr4_sys_kill(struct thread *, struct svr4_sys_kill_args *); +int svr4_sys_pgrpsys(struct thread *, struct svr4_sys_pgrpsys_args *); +int svr4_sys_times(struct thread *, struct svr4_sys_times_args *); +int svr4_sys_signal(struct thread *, struct svr4_sys_signal_args *); #if defined(NOTYET) -int svr4_sys_msgsys __P((struct thread *, struct svr4_sys_msgsys_args *)); +int svr4_sys_msgsys(struct thread *, struct svr4_sys_msgsys_args *); #else #endif -int svr4_sys_sysarch __P((struct thread *, struct svr4_sys_sysarch_args *)); -int svr4_sys_ioctl __P((struct thread *, struct svr4_sys_ioctl_args *)); -int svr4_sys_utssys __P((struct thread *, struct svr4_sys_utssys_args *)); -int svr4_sys_execve __P((struct thread *, struct svr4_sys_execve_args *)); -int svr4_sys_fcntl __P((struct thread *, struct svr4_sys_fcntl_args *)); -int svr4_sys_ulimit __P((struct thread *, struct svr4_sys_ulimit_args *)); -int svr4_sys_getdents __P((struct thread *, struct svr4_sys_getdents_args *)); -int svr4_sys_getmsg __P((struct thread *, struct svr4_sys_getmsg_args *)); -int svr4_sys_putmsg __P((struct thread *, struct svr4_sys_putmsg_args *)); -int svr4_sys_poll __P((struct thread *, struct svr4_sys_poll_args *)); -int svr4_sys_lstat __P((struct thread *, struct svr4_sys_lstat_args *)); -int svr4_sys_sigprocmask __P((struct thread *, struct svr4_sys_sigprocmask_args *)); -int svr4_sys_sigsuspend __P((struct thread *, struct svr4_sys_sigsuspend_args *)); -int svr4_sys_sigaltstack __P((struct thread *, struct svr4_sys_sigaltstack_args *)); -int svr4_sys_sigaction __P((struct thread *, struct svr4_sys_sigaction_args *)); -int svr4_sys_sigpending __P((struct thread *, struct svr4_sys_sigpending_args *)); -int svr4_sys_context __P((struct thread *, struct svr4_sys_context_args *)); -int svr4_sys_statvfs __P((struct thread *, struct svr4_sys_statvfs_args *)); -int svr4_sys_fstatvfs __P((struct thread *, struct svr4_sys_fstatvfs_args *)); -int svr4_sys_waitsys __P((struct thread *, struct svr4_sys_waitsys_args *)); -int svr4_sys_hrtsys __P((struct thread *, struct svr4_sys_hrtsys_args *)); -int svr4_sys_pathconf __P((struct thread *, struct svr4_sys_pathconf_args *)); -int svr4_sys_mmap __P((struct thread *, struct svr4_sys_mmap_args *)); -int svr4_sys_fpathconf __P((struct thread *, struct svr4_sys_fpathconf_args *)); -int svr4_sys_xstat __P((struct thread *, struct svr4_sys_xstat_args *)); -int svr4_sys_lxstat __P((struct thread *, struct svr4_sys_lxstat_args *)); -int svr4_sys_fxstat __P((struct thread *, struct svr4_sys_fxstat_args *)); -int svr4_sys_xmknod __P((struct thread *, struct svr4_sys_xmknod_args *)); -int svr4_sys_setrlimit __P((struct thread *, struct svr4_sys_setrlimit_args *)); -int svr4_sys_getrlimit __P((struct thread *, struct svr4_sys_getrlimit_args *)); -int svr4_sys_memcntl __P((struct thread *, struct svr4_sys_memcntl_args *)); -int svr4_sys_uname __P((struct thread *, struct svr4_sys_uname_args *)); -int svr4_sys_sysconfig __P((struct thread *, struct svr4_sys_sysconfig_args *)); -int svr4_sys_systeminfo __P((struct thread *, struct svr4_sys_systeminfo_args *)); -int svr4_sys_fchroot __P((struct thread *, struct svr4_sys_fchroot_args *)); -int svr4_sys_utimes __P((struct thread *, struct svr4_sys_utimes_args *)); -int svr4_sys_vhangup __P((struct thread *, struct svr4_sys_vhangup_args *)); -int svr4_sys_gettimeofday __P((struct thread *, struct svr4_sys_gettimeofday_args *)); -int svr4_sys_llseek __P((struct thread *, struct svr4_sys_llseek_args *)); -int svr4_sys_acl __P((struct thread *, struct svr4_sys_acl_args *)); -int svr4_sys_auditsys __P((struct thread *, struct svr4_sys_auditsys_args *)); -int svr4_sys_facl __P((struct thread *, struct svr4_sys_facl_args *)); -int svr4_sys_resolvepath __P((struct thread *, struct svr4_sys_resolvepath_args *)); -int svr4_sys_getdents64 __P((struct thread *, struct svr4_sys_getdents64_args *)); -int svr4_sys_mmap64 __P((struct thread *, struct svr4_sys_mmap64_args *)); -int svr4_sys_stat64 __P((struct thread *, struct svr4_sys_stat64_args *)); -int svr4_sys_lstat64 __P((struct thread *, struct svr4_sys_lstat64_args *)); -int svr4_sys_fstat64 __P((struct thread *, struct svr4_sys_fstat64_args *)); -int svr4_sys_statvfs64 __P((struct thread *, struct svr4_sys_statvfs64_args *)); -int svr4_sys_fstatvfs64 __P((struct thread *, struct svr4_sys_fstatvfs64_args *)); -int svr4_sys_setrlimit64 __P((struct thread *, struct svr4_sys_setrlimit64_args *)); -int svr4_sys_getrlimit64 __P((struct thread *, struct svr4_sys_getrlimit64_args *)); -int svr4_sys_creat64 __P((struct thread *, struct svr4_sys_creat64_args *)); -int svr4_sys_open64 __P((struct thread *, struct svr4_sys_open64_args *)); -int svr4_sys_socket __P((struct thread *, struct svr4_sys_socket_args *)); -int svr4_sys_recv __P((struct thread *, struct svr4_sys_recv_args *)); -int svr4_sys_send __P((struct thread *, struct svr4_sys_send_args *)); -int svr4_sys_sendto __P((struct thread *, struct svr4_sys_sendto_args *)); +int svr4_sys_sysarch(struct thread *, struct svr4_sys_sysarch_args *); +int svr4_sys_ioctl(struct thread *, struct svr4_sys_ioctl_args *); +int svr4_sys_utssys(struct thread *, struct svr4_sys_utssys_args *); +int svr4_sys_execve(struct thread *, struct svr4_sys_execve_args *); +int svr4_sys_fcntl(struct thread *, struct svr4_sys_fcntl_args *); +int svr4_sys_ulimit(struct thread *, struct svr4_sys_ulimit_args *); +int svr4_sys_getdents(struct thread *, struct svr4_sys_getdents_args *); +int svr4_sys_getmsg(struct thread *, struct svr4_sys_getmsg_args *); +int svr4_sys_putmsg(struct thread *, struct svr4_sys_putmsg_args *); +int svr4_sys_poll(struct thread *, struct svr4_sys_poll_args *); +int svr4_sys_lstat(struct thread *, struct svr4_sys_lstat_args *); +int svr4_sys_sigprocmask(struct thread *, struct svr4_sys_sigprocmask_args *); +int svr4_sys_sigsuspend(struct thread *, struct svr4_sys_sigsuspend_args *); +int svr4_sys_sigaltstack(struct thread *, struct svr4_sys_sigaltstack_args *); +int svr4_sys_sigaction(struct thread *, struct svr4_sys_sigaction_args *); +int svr4_sys_sigpending(struct thread *, struct svr4_sys_sigpending_args *); +int svr4_sys_context(struct thread *, struct svr4_sys_context_args *); +int svr4_sys_statvfs(struct thread *, struct svr4_sys_statvfs_args *); +int svr4_sys_fstatvfs(struct thread *, struct svr4_sys_fstatvfs_args *); +int svr4_sys_waitsys(struct thread *, struct svr4_sys_waitsys_args *); +int svr4_sys_hrtsys(struct thread *, struct svr4_sys_hrtsys_args *); +int svr4_sys_pathconf(struct thread *, struct svr4_sys_pathconf_args *); +int svr4_sys_mmap(struct thread *, struct svr4_sys_mmap_args *); +int svr4_sys_fpathconf(struct thread *, struct svr4_sys_fpathconf_args *); +int svr4_sys_xstat(struct thread *, struct svr4_sys_xstat_args *); +int svr4_sys_lxstat(struct thread *, struct svr4_sys_lxstat_args *); +int svr4_sys_fxstat(struct thread *, struct svr4_sys_fxstat_args *); +int svr4_sys_xmknod(struct thread *, struct svr4_sys_xmknod_args *); +int svr4_sys_setrlimit(struct thread *, struct svr4_sys_setrlimit_args *); +int svr4_sys_getrlimit(struct thread *, struct svr4_sys_getrlimit_args *); +int svr4_sys_memcntl(struct thread *, struct svr4_sys_memcntl_args *); +int svr4_sys_uname(struct thread *, struct svr4_sys_uname_args *); +int svr4_sys_sysconfig(struct thread *, struct svr4_sys_sysconfig_args *); +int svr4_sys_systeminfo(struct thread *, struct svr4_sys_systeminfo_args *); +int svr4_sys_fchroot(struct thread *, struct svr4_sys_fchroot_args *); +int svr4_sys_utimes(struct thread *, struct svr4_sys_utimes_args *); +int svr4_sys_vhangup(struct thread *, struct svr4_sys_vhangup_args *); +int svr4_sys_gettimeofday(struct thread *, struct svr4_sys_gettimeofday_args *); +int svr4_sys_llseek(struct thread *, struct svr4_sys_llseek_args *); +int svr4_sys_acl(struct thread *, struct svr4_sys_acl_args *); +int svr4_sys_auditsys(struct thread *, struct svr4_sys_auditsys_args *); +int svr4_sys_facl(struct thread *, struct svr4_sys_facl_args *); +int svr4_sys_resolvepath(struct thread *, struct svr4_sys_resolvepath_args *); +int svr4_sys_getdents64(struct thread *, struct svr4_sys_getdents64_args *); +int svr4_sys_mmap64(struct thread *, struct svr4_sys_mmap64_args *); +int svr4_sys_stat64(struct thread *, struct svr4_sys_stat64_args *); +int svr4_sys_lstat64(struct thread *, struct svr4_sys_lstat64_args *); +int svr4_sys_fstat64(struct thread *, struct svr4_sys_fstat64_args *); +int svr4_sys_statvfs64(struct thread *, struct svr4_sys_statvfs64_args *); +int svr4_sys_fstatvfs64(struct thread *, struct svr4_sys_fstatvfs64_args *); +int svr4_sys_setrlimit64(struct thread *, struct svr4_sys_setrlimit64_args *); +int svr4_sys_getrlimit64(struct thread *, struct svr4_sys_getrlimit64_args *); +int svr4_sys_creat64(struct thread *, struct svr4_sys_creat64_args *); +int svr4_sys_open64(struct thread *, struct svr4_sys_open64_args *); +int svr4_sys_socket(struct thread *, struct svr4_sys_socket_args *); +int svr4_sys_recv(struct thread *, struct svr4_sys_recv_args *); +int svr4_sys_send(struct thread *, struct svr4_sys_send_args *); +int svr4_sys_sendto(struct thread *, struct svr4_sys_sendto_args *); #ifdef COMPAT_43 diff --git a/sys/compat/svr4/svr4_resource.c b/sys/compat/svr4/svr4_resource.c index e9ff1a3e2113..289e6fa333f2 100644 --- a/sys/compat/svr4/svr4_resource.c +++ b/sys/compat/svr4/svr4_resource.c @@ -88,7 +88,7 @@ #include #include -static __inline int svr4_to_native_rl __P((int)); +static __inline int svr4_to_native_rl(int); static __inline int svr4_to_native_rl(rl) diff --git a/sys/compat/svr4/svr4_signal.c b/sys/compat/svr4/svr4_signal.c index d4bf8e9f4b92..471022acc8f2 100644 --- a/sys/compat/svr4/svr4_signal.c +++ b/sys/compat/svr4/svr4_signal.c @@ -53,11 +53,9 @@ #define svr4_sigismember(s, n) ((s)->bits[svr4_sigword(n)] & svr4_sigmask(n)) #define svr4_sigaddset(s, n) ((s)->bits[svr4_sigword(n)] |= svr4_sigmask(n)) -void svr4_to_bsd_sigaction __P((const struct svr4_sigaction *, - struct sigaction *)); -void bsd_to_svr4_sigaction __P((const struct sigaction *, - struct svr4_sigaction *)); -void svr4_sigfillset __P((svr4_sigset_t *)); +void svr4_to_bsd_sigaction(const struct svr4_sigaction *, struct sigaction *); +void bsd_to_svr4_sigaction(const struct sigaction *, struct svr4_sigaction *); +void svr4_sigfillset(svr4_sigset_t *); int bsd_to_svr4_sig[SVR4_SIGTBLSZ] = { SVR4_SIGHUP, diff --git a/sys/compat/svr4/svr4_signal.h b/sys/compat/svr4/svr4_signal.h index f7b0b520166b..5a01a8fb24e1 100644 --- a/sys/compat/svr4/svr4_signal.h +++ b/sys/compat/svr4/svr4_signal.h @@ -79,7 +79,7 @@ #define SVR4_SIGIGNORE_MASK 0x0800 #define SVR4_SIGPAUSE_MASK 0x1000 -typedef void (*svr4_sig_t) __P((int, svr4_siginfo_t *, void *)); +typedef void (*svr4_sig_t)(int, svr4_siginfo_t *, void *); #define SVR4_SIG_DFL (svr4_sig_t) 0 #define SVR4_SIG_ERR (svr4_sig_t) -1 #define SVR4_SIG_IGN (svr4_sig_t) 1 @@ -134,10 +134,10 @@ struct svr4_sigaltstack { #define SVR4_MINSIGSTKSZ 8192 -void bsd_to_svr4_sigaltstack __P((const struct sigaltstack *, struct svr4_sigaltstack *)); -void bsd_to_svr4_sigset __P((const sigset_t *, svr4_sigset_t *)); -void svr4_to_bsd_sigaltstack __P((const struct svr4_sigaltstack *, struct sigaltstack *)); -void svr4_to_bsd_sigset __P((const svr4_sigset_t *, sigset_t *)); +void bsd_to_svr4_sigaltstack(const struct sigaltstack *, struct svr4_sigaltstack *); +void bsd_to_svr4_sigset(const sigset_t *, svr4_sigset_t *); +void svr4_to_bsd_sigaltstack(const struct svr4_sigaltstack *, struct sigaltstack *); +void svr4_to_bsd_sigset(const svr4_sigset_t *, sigset_t *); void svr4_sendsig(sig_t, int, sigset_t *, u_long); #endif /* !_SVR4_SIGNAL_H_ */ diff --git a/sys/compat/svr4/svr4_socket.h b/sys/compat/svr4/svr4_socket.h index e8603925a794..434f1f28b10b 100644 --- a/sys/compat/svr4/svr4_socket.h +++ b/sys/compat/svr4/svr4_socket.h @@ -48,9 +48,9 @@ struct svr4_sockaddr_in { u_char sin_zero[8]; }; -struct sockaddr_un *svr4_find_socket __P((struct thread *, struct file *, - udev_t, ino_t)); -void svr4_delete_socket __P((struct proc *, struct file *)); -int svr4_add_socket __P((struct thread *, const char *, struct stat *)); +struct sockaddr_un *svr4_find_socket(struct thread *, struct file *, + udev_t, ino_t); +void svr4_delete_socket(struct proc *, struct file *); +int svr4_add_socket(struct thread *, const char *, struct stat *); #endif /* _SVR4_SOCKET_H_ */ diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c index 65cf49a2ce25..9f41e10efad0 100644 --- a/sys/compat/svr4/svr4_sockio.c +++ b/sys/compat/svr4/svr4_sockio.c @@ -43,7 +43,7 @@ #include #include -static int bsd_to_svr4_flags __P((int)); +static int bsd_to_svr4_flags(int); #define bsd_to_svr4_flag(a) \ if (bf & __CONCAT(I,a)) sf |= __CONCAT(SVR4_I,a) diff --git a/sys/compat/svr4/svr4_stat.c b/sys/compat/svr4/svr4_stat.c index a3880d5b8876..997e4740621a 100644 --- a/sys/compat/svr4/svr4_stat.c +++ b/sys/compat/svr4/svr4_stat.c @@ -72,10 +72,10 @@ struct svr4_ustat_args { struct svr4_ustat * name; }; -static void bsd_to_svr4_xstat __P((struct stat *, struct svr4_xstat *)); -static void bsd_to_svr4_stat64 __P((struct stat *, struct svr4_stat64 *)); -int svr4_ustat __P((struct thread *, struct svr4_ustat_args *)); -static int svr4_to_bsd_pathconf __P((int)); +static void bsd_to_svr4_xstat(struct stat *, struct svr4_xstat *); +static void bsd_to_svr4_stat64(struct stat *, struct svr4_stat64 *); +int svr4_ustat(struct thread *, struct svr4_ustat_args *); +static int svr4_to_bsd_pathconf(int); /* * SVR4 uses named pipes as named sockets, so we tell programs @@ -85,7 +85,7 @@ static int svr4_to_bsd_pathconf __P((int)); #ifndef SVR4_NO_OSTAT -static void bsd_to_svr4_stat __P((struct stat *, struct svr4_stat *)); +static void bsd_to_svr4_stat(struct stat *, struct svr4_stat *); static void bsd_to_svr4_stat(st, st4) diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c index 7b2d810c85bb..feaedcbcdb45 100644 --- a/sys/compat/svr4/svr4_stream.c +++ b/sys/compat/svr4/svr4_stream.c @@ -75,67 +75,64 @@ #include /* Utils */ -static int clean_pipe __P((struct thread *, const char *)); -static void getparm __P((struct file *, struct svr4_si_sockparms *)); -static int svr4_do_putmsg __P((struct thread *, struct svr4_sys_putmsg_args *, - struct file *)); -static int svr4_do_getmsg __P((struct thread *, struct svr4_sys_getmsg_args *, - struct file *)); +static int clean_pipe(struct thread *, const char *); +static void getparm(struct file *, struct svr4_si_sockparms *); +static int svr4_do_putmsg(struct thread *, struct svr4_sys_putmsg_args *, + struct file *); +static int svr4_do_getmsg(struct thread *, struct svr4_sys_getmsg_args *, + struct file *); /* Address Conversions */ -static void sockaddr_to_netaddr_in __P((struct svr4_strmcmd *, - const struct sockaddr_in *)); -static void sockaddr_to_netaddr_un __P((struct svr4_strmcmd *, - const struct sockaddr_un *)); -static void netaddr_to_sockaddr_in __P((struct sockaddr_in *, - const struct svr4_strmcmd *)); -static void netaddr_to_sockaddr_un __P((struct sockaddr_un *, - const struct svr4_strmcmd *)); +static void sockaddr_to_netaddr_in(struct svr4_strmcmd *, + const struct sockaddr_in *); +static void sockaddr_to_netaddr_un(struct svr4_strmcmd *, + const struct sockaddr_un *); +static void netaddr_to_sockaddr_in(struct sockaddr_in *, + const struct svr4_strmcmd *); +static void netaddr_to_sockaddr_un(struct sockaddr_un *, + const struct svr4_strmcmd *); /* stream ioctls */ -static int i_nread __P((struct file *, struct thread *, register_t *, int, - u_long, caddr_t)); -static int i_fdinsert __P((struct file *, struct thread *, register_t *, int, - u_long, caddr_t)); -static int i_str __P((struct file *, struct thread *, register_t *, int, - u_long, caddr_t)); -static int i_setsig __P((struct file *, struct thread *, register_t *, int, - u_long, caddr_t)); -static int i_getsig __P((struct file *, struct thread *, register_t *, int, - u_long, caddr_t)); -static int _i_bind_rsvd __P((struct file *, struct thread *, register_t *, int, - u_long, caddr_t)); -static int _i_rele_rsvd __P((struct file *, struct thread *, register_t *, int, - u_long, caddr_t)); +static int i_nread(struct file *, struct thread *, register_t *, int, + u_long, caddr_t); +static int i_fdinsert(struct file *, struct thread *, register_t *, int, + u_long, caddr_t); +static int i_str(struct file *, struct thread *, register_t *, int, + u_long, caddr_t); +static int i_setsig(struct file *, struct thread *, register_t *, int, + u_long, caddr_t); +static int i_getsig(struct file *, struct thread *, register_t *, int, + u_long, caddr_t); +static int _i_bind_rsvd(struct file *, struct thread *, register_t *, int, + u_long, caddr_t); +static int _i_rele_rsvd(struct file *, struct thread *, register_t *, int, + u_long, caddr_t); /* i_str sockmod calls */ -static int sockmod __P((struct file *, int, struct svr4_strioctl *, - struct thread *)); -static int si_listen __P((struct file *, int, struct svr4_strioctl *, - struct thread *)); -static int si_ogetudata __P((struct file *, int, struct svr4_strioctl *, - struct thread *)); -static int si_sockparams __P((struct file *, int, struct svr4_strioctl *, - struct thread *)); -static int si_shutdown __P((struct file *, int, struct svr4_strioctl *, - struct thread *)); -static int si_getudata __P((struct file *, int, struct svr4_strioctl *, - struct thread *)); +static int sockmod(struct file *, int, struct svr4_strioctl *, + struct thread *); +static int si_listen(struct file *, int, struct svr4_strioctl *, + struct thread *); +static int si_ogetudata(struct file *, int, struct svr4_strioctl *, + struct thread *); +static int si_sockparams(struct file *, int, struct svr4_strioctl *, + struct thread *); +static int si_shutdown (struct file *, int, struct svr4_strioctl *, + struct thread *); +static int si_getudata(struct file *, int, struct svr4_strioctl *, + struct thread *); /* i_str timod calls */ -static int timod __P((struct file *, int, struct svr4_strioctl *, - struct thread *)); -static int ti_getinfo __P((struct file *, int, struct svr4_strioctl *, - struct thread *)); -static int ti_bind __P((struct file *, int, struct svr4_strioctl *, - struct thread *)); +static int timod(struct file *, int, struct svr4_strioctl *, struct thread *); +static int ti_getinfo(struct file *, int, struct svr4_strioctl *, + struct thread *); +static int ti_bind(struct file *, int, struct svr4_strioctl *, struct thread *); /* infrastructure */ -static int svr4_sendit __P((struct thread *td, int s, struct msghdr *mp, - int flags)); +static int svr4_sendit(struct thread *td, int s, struct msghdr *mp, int flags); -static int svr4_recvit __P((struct thread *td, int s, struct msghdr *mp, - caddr_t namelenp)); +static int svr4_recvit(struct thread *td, int s, struct msghdr *mp, + caddr_t namelenp); /* Ok, so we shouldn't use sendit() in uipc_syscalls.c because * it isn't part of a "public" interface; We're supposed to use @@ -368,11 +365,11 @@ done1: } #ifdef DEBUG_SVR4 -static void bufprint __P((u_char *, size_t)); -static int show_ioc __P((const char *, struct svr4_strioctl *)); -static int show_strbuf __P((struct svr4_strbuf *)); -static void show_msg __P((const char *, int, struct svr4_strbuf *, - struct svr4_strbuf *, int)); +static void bufprint(u_char *, size_t); +static int show_ioc(const char *, struct svr4_strioctl *); +static int show_strbuf(struct svr4_strbuf *); +static void show_msg(const char *, int, struct svr4_strbuf *, + struct svr4_strbuf *, int); static void bufprint(buf, len) diff --git a/sys/compat/svr4/svr4_stropts.h b/sys/compat/svr4/svr4_stropts.h index 2fa14a1e988a..e5a39e9ab779 100644 --- a/sys/compat/svr4/svr4_stropts.h +++ b/sys/compat/svr4/svr4_stropts.h @@ -170,6 +170,6 @@ struct svr4_netaddr_un { #define SVR4_ADDROF(sc) (void *) (((char *) (sc)) + (sc)->offs) #define SVR4_C_ADDROF(sc) (const void *) (((const char *) (sc)) + (sc)->offs) -struct svr4_strm *svr4_stream_get __P((struct file *fp)); +struct svr4_strm *svr4_stream_get(struct file *fp); #endif /* !_SVR4_STROPTS */ diff --git a/sys/compat/svr4/svr4_termios.c b/sys/compat/svr4/svr4_termios.c index 981aef8c436e..5fdd5a63705e 100644 --- a/sys/compat/svr4/svr4_termios.c +++ b/sys/compat/svr4/svr4_termios.c @@ -50,19 +50,19 @@ # endif #endif -static u_long bsd_to_svr4_speed __P((u_long, u_long)); -static u_long svr4_to_bsd_speed __P((u_long, u_long)); -static void svr4_to_bsd_termios __P((const struct svr4_termios *, - struct termios *, int)); -static void bsd_to_svr4_termios __P((const struct termios *, - struct svr4_termios *)); -static void svr4_termio_to_termios __P((const struct svr4_termio *, - struct svr4_termios *)); -static void svr4_termios_to_termio __P((const struct svr4_termios *, - struct svr4_termio *)); +static u_long bsd_to_svr4_speed(u_long, u_long); +static u_long svr4_to_bsd_speed(u_long, u_long); +static void svr4_to_bsd_termios(const struct svr4_termios *, + struct termios *, int); +static void bsd_to_svr4_termios(const struct termios *, + struct svr4_termios *); +static void svr4_termio_to_termios(const struct svr4_termio *, + struct svr4_termios *); +static void svr4_termios_to_termio(const struct svr4_termios *, + struct svr4_termio *); #ifdef DEBUG_SVR4 -static void print_svr4_termios __P((const struct svr4_termios *)); -static void print_bsd_termios __P((const struct termios *)); +static void print_svr4_termios(const struct svr4_termios *); +static void print_bsd_termios(const struct termios *); #endif /* DEBUG_SVR4 */ #define undefined_char(a,b) /**/ diff --git a/sys/compat/svr4/svr4_ttold.c b/sys/compat/svr4/svr4_ttold.c index 90cdae149a90..47a813580cff 100644 --- a/sys/compat/svr4/svr4_ttold.c +++ b/sys/compat/svr4/svr4_ttold.c @@ -42,23 +42,23 @@ #include -static void svr4_tchars_to_bsd_tchars __P((const struct svr4_tchars *st, - struct tchars *bt)); -static void bsd_tchars_to_svr4_tchars __P((const struct tchars *bt, - struct svr4_tchars *st)); -static void svr4_sgttyb_to_bsd_sgttyb __P((const struct svr4_sgttyb *ss, - struct sgttyb *bs)); -static void bsd_sgttyb_to_svr4_sgttyb __P((const struct sgttyb *bs, - struct svr4_sgttyb *ss)); -static void svr4_ltchars_to_bsd_ltchars __P((const struct svr4_ltchars *sl, - struct ltchars *bl)); -static void bsd_ltchars_to_svr4_ltchars __P((const struct ltchars *bl, - struct svr4_ltchars *sl)); +static void svr4_tchars_to_bsd_tchars(const struct svr4_tchars *st, + struct tchars *bt); +static void bsd_tchars_to_svr4_tchars(const struct tchars *bt, + struct svr4_tchars *st); +static void svr4_sgttyb_to_bsd_sgttyb(const struct svr4_sgttyb *ss, + struct sgttyb *bs); +static void bsd_sgttyb_to_svr4_sgttyb(const struct sgttyb *bs, + struct svr4_sgttyb *ss); +static void svr4_ltchars_to_bsd_ltchars(const struct svr4_ltchars *sl, + struct ltchars *bl); +static void bsd_ltchars_to_svr4_ltchars(const struct ltchars *bl, + struct svr4_ltchars *sl); #ifdef DEBUG_SVR4 -static void print_svr4_sgttyb __P((const char *, struct svr4_sgttyb *)); -static void print_svr4_tchars __P((const char *, struct svr4_tchars *)); -static void print_svr4_ltchars __P((const char *, struct svr4_ltchars *)); +static void print_svr4_sgttyb(const char *, struct svr4_sgttyb *); +static void print_svr4_tchars(const char *, struct svr4_tchars *); +static void print_svr4_ltchars(const char *, struct svr4_ltchars *); static void print_svr4_sgttyb(str, ss) diff --git a/sys/compat/svr4/svr4_util.h b/sys/compat/svr4/svr4_util.h index 9429c0fd42ee..9e5be7f408e4 100644 --- a/sys/compat/svr4/svr4_util.h +++ b/sys/compat/svr4/svr4_util.h @@ -68,8 +68,8 @@ stackgap_alloc(sgp, sz) } extern const char svr4_emul_path[]; -int svr4_emul_find __P((struct thread *, caddr_t *, const char *, char *, - char **, int)); +int svr4_emul_find(struct thread *, caddr_t *, const char *, char *, + char **, int); #define CHECKALT(p, sgp, path, i) \ do { \ diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c index 9749e0cde112..a32a77b1bff6 100644 --- a/sys/i386/apm/apm.c +++ b/sys/i386/apm/apm.c @@ -48,12 +48,12 @@ #include /* 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 9749e0cde112..a32a77b1bff6 100644 --- a/sys/i386/bios/apm.c +++ b/sys/i386/bios/apm.c @@ -48,12 +48,12 @@ #include /* 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 07b7f41fcf68..1a2a22a58680 100644 --- a/sys/i386/ibcs2/ibcs2_fcntl.c +++ b/sys/i386/ibcs2/ibcs2_fcntl.c @@ -44,11 +44,11 @@ #include #include -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 3c3d36addda5..b192b61d3127 100644 --- a/sys/i386/ibcs2/ibcs2_ioctl.c +++ b/sys/i386/ibcs2/ibcs2_ioctl.c @@ -50,10 +50,10 @@ #include #include -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 804f82db674b..cdf8e87f7161 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 c7ac3df69b06..9e49af1f2ff0 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 197c29518f21..fd32aafb770f 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 21df0875b23a..eda9adff58a4 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 ebe6a509b782..0bd14d65926a 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 f0c72bdc10c1..9a22a7b91bbe 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 3940899752c7..062a5b5aaaf6 100644 --- a/sys/i386/ibcs2/ibcs2_stat.c +++ b/sys/i386/ibcs2/ibcs2_stat.c @@ -49,8 +49,8 @@ #include -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 93382c411930..a3b73577b3b2 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 07e827f561b4..0c7521d1c762 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 fd89db4f954b..6148b124ca5e 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 52212fe09df3..208d80b0369d 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 8aab7811949a..b0d871f3ee25 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 20bd09d22b0d..38179a6b1306 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 10b94993b374..06c191b402ac 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 a28e9a769ef5..02a24a315be9 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 3edc1cb2d690..5485f89faa43 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 0cfff1aead71..c32afc4b8a7f 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 22d02fab8e21..f30c45de79d8 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 ab47a94bd11a..4c91d13de0c7 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 589a4be18997..4746f5cefda3 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 d4a375a20788..b2f1bc43a9cf 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 3256f9929175..cf5a9119416c 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 adf460eb2e9d..f012ee545d51 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 b034e9a1ffbf..74848a434903 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 7358a9e41223..7348b67a3e95 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 5b50824f824f..f011b5c37149 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 bd8a7da017a9..a00f475ede28 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 3f3c774e74c3..ca15fb267ee9 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 d671e1230f7a..3e47fa83d4d6 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 34228e238793..3a57c0092ee8 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 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 __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 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 eb6500010b66..6ce9768ea4ba 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 4b11496dc13f..680ce147d662 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 456e4f7978af..f20a689845b8 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 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 __P((struct vm86context *, u_short, u_short)); +extern vm_offset_t vm86_getaddr(struct vm86context *, u_short, u_short); #endif /* _KERNEL */ #endif /* _MACHINE_VM86_H_ */