2 files changed, 23 insertions, 29 deletions

diff --git a/sys/ia64/include/cpu.h b/sys/ia64/include/cpu.h
index 502fc49..7269e92 100644
--- a/sys/ia64/include/cpu.h
+++ b/sys/ia64/include/cpu.h
@@ -90,34 +90,16 @@ struct clockframe {
 
 #ifdef _KERNEL
 
-struct thread;
-struct trapframe;
-
-void	cpu_mp_add(u_int, u_int, u_int);
-int	do_ast(struct trapframe *);
-void	fork_trampoline(void);				/* MAGIC */
-int	ia64_count_cpus(void);
-int	ia64_highfp_drop(struct thread *);
-int	ia64_highfp_load(struct thread *);
-int	ia64_highfp_save(struct thread *);
-void	ia64_init(void);
-void	ia64_probe_sapics(void);
-void	interrupt(u_int64_t, struct trapframe *);
-void	map_gateway_page(void);
-void	map_pal_code(void);
-void	map_port_space(void);
-int	syscall(struct trapframe *);
-void	trap(int, struct trapframe *);
-
 /*
  * Return contents of in-cpu fast counter as a sort of "bogo-time"
  * for non-critical timing.
  */
-static __inline u_int64_t
-get_cyclecount(void)
-{
-	return (ia64_get_itc());
-}
+#define	get_cyclecount		ia64_get_itc
+
+void	cpu_halt(void);
+void	cpu_reset(void);
+void	fork_trampoline(void);				/* MAGIC */
+void	swi_vm(void *);
 
 #endif /* _KERNEL */
 
diff --git a/sys/ia64/include/md_var.h b/sys/ia64/include/md_var.h
index 38d98de..3301f34 100644
--- a/sys/ia64/include/md_var.h
+++ b/sys/ia64/include/md_var.h
@@ -39,8 +39,9 @@ extern	int	szsigcode;
 extern	long	Maxmem;
 
 struct fpreg;
-struct thread;
 struct reg;
+struct thread;
+struct trapframe;
 
 struct ia64_fdesc {
 	u_int64_t	func;
@@ -51,11 +52,22 @@ struct ia64_fdesc {
 #define FDESC_GP(fn)    (((struct ia64_fdesc *) fn)->gp)
 
 void	busdma_swi(void);
-void	cpu_halt(void);
-void	cpu_reset(void);
-int	is_physical_memory(vm_offset_t addr);
+int	copyout_regstack(struct thread *, uint64_t *, uint64_t *);
+void	cpu_mp_add(u_int, u_int, u_int);
+int	do_ast(struct trapframe *);
+int	ia64_count_cpus(void);
+int	ia64_highfp_drop(struct thread *);
+int	ia64_highfp_load(struct thread *);
+int	ia64_highfp_save(struct thread *);
+void	ia64_init(void);
+void	ia64_probe_sapics(void);
+void	interrupt(uint64_t, struct trapframe *);
+void	map_gateway_page(void);
+void	map_pal_code(void);
+void	map_port_space(void);
 void	os_boot_rendez(void);
 void	os_mca(void);
-void	swi_vm(void *);
+int	syscall(struct trapframe *);
+void	trap(int, struct trapframe *);
 
 #endif /* !_MACHINE_MD_VAR_H_ */