diff --git a/sys/arch/amd64/include/cpu.h b/sys/arch/amd64/include/cpu.h
index 1d61eb401093..03705a86d28c 100644
--- a/sys/arch/amd64/include/cpu.h
+++ b/sys/arch/amd64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.17 2007/03/12 16:43:11 ad Exp $	*/
+/*	$NetBSD: cpu.h,v 1.18 2007/03/16 06:20:36 xtraeme Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -106,8 +106,8 @@ struct cpu_info {
 	u_int64_t	ci_tsc_freq;
 
 	const struct cpu_functions *ci_func;
-	void (*cpu_setup) __P((struct cpu_info *));
-	void (*ci_info) __P((struct cpu_info *));
+	void (*cpu_setup)(struct cpu_info *);
+	void (*ci_info)(struct cpu_info *);
 
 	int		ci_want_resched;
 	int		ci_astpending;
@@ -161,8 +161,8 @@ extern struct cpu_info *cpu_info_list;
 
 extern struct cpu_info *cpu_info[X86_MAXPROCS];
 
-void cpu_boot_secondary_processors __P((void));
-void cpu_init_idle_pcbs __P((void));    
+void cpu_boot_secondary_processors(void);
+void cpu_init_idle_pcbs(void);    
 
 
 #else /* !MULTIPROCESSOR */
@@ -229,7 +229,7 @@ extern void cpu_signotify(struct lwp *);
 /*
  * We need a machine-independent name for this.
  */
-extern void (*delay_func) __P((int));
+extern void (*delay_func)(int);
 
 #define DELAY(x)		(*delay_func)(x)
 #define delay(x)		(*delay_func)(x)
@@ -249,52 +249,49 @@ extern int cpuid_level;
 
 /* identcpu.c */
 
-void	identifycpu __P((struct cpu_info *));
-void cpu_probe_features __P((struct cpu_info *));
+void	identifycpu(struct cpu_info *);
+void cpu_probe_features(struct cpu_info *);
 
 /* machdep.c */
-void	dumpconf __P((void));
-int	cpu_maxproc __P((void));
-void	cpu_reset __P((void));
-void	x86_64_proc0_tss_ldt_init __P((void));
-void	x86_64_init_pcb_tss_ldt __P((struct cpu_info *));
-void	cpu_proc_fork __P((struct proc *, struct proc *));
+void	dumpconf(void);
+int	cpu_maxproc(void);
+void	cpu_reset(void);
+void	x86_64_proc0_tss_ldt_init(void);
+void	x86_64_init_pcb_tss_ldt(struct cpu_info *);
+void	cpu_proc_fork(struct proc *, struct proc *);
 
 struct region_descriptor;
-void	lgdt __P((struct region_descriptor *));
-void	fillw __P((short, void *, size_t));
+void	lgdt(struct region_descriptor *);
+void	fillw(short, void *, size_t);
 
 struct pcb;
-void	savectx __P((struct pcb *));
-void	switch_exit __P((struct lwp *, void (*)(struct lwp *)));
-void	proc_trampoline __P((void));
-void	child_trampoline __P((void));
+void	savectx(struct pcb *);
+void	switch_exit(struct lwp *, void (*)(struct lwp *));
+void	proc_trampoline(void);
+void	child_trampoline(void);
 
 /* clock.c */
-void	initrtclock __P((u_long));
-void	startrtclock __P((void));
-void	i8254_delay __P((int));
-void	i8254_microtime __P((struct timeval *));
-void	i8254_initclocks __P((void));
+void	initrtclock(u_long);
+void	startrtclock(void);
+void	i8254_delay(int);
+void	i8254_microtime(struct timeval *);
+void	i8254_initclocks(void);
 
-void cpu_init_msrs __P((struct cpu_info *));
+void cpu_init_msrs(struct cpu_info *);
 
 
 /* vm_machdep.c */
-int kvtop __P((void *));
+int kvtop(void *);
 
 /* trap.c */
-void	child_return __P((void *));
+void	child_return(void *);
 
 /* consinit.c */
-void kgdb_port_init __P((void));
+void kgdb_port_init(void);
 
 /* bus_machdep.c */
-void x86_bus_space_init __P((void));
-void x86_bus_space_mallocok __P((void));
-
-/* powernow_k8.c */
-void k8_powernow_init(void);
+void x86_bus_space_init(void);
+void x86_bus_space_mallocok(void);
 
 #endif /* _KERNEL */