Further cleanup <machine/cpu.h> and <machine/md_var.h>: move the MI

prototypes of cpu_halt(), cpu_reset() and swi_vm() from md_var.h to
cpu.h. This affects db_command.c and kern_shutdown.c.

ia64: move all MD prototypes from cpu.h to md_var.h. This affects
madt.c, interrupt.c and mp_machdep.c. Remove is_physical_memory().
It's not used (vm_machdep.c).

alpha: the MD prototypes have been left in cpu.h with a comment
that they should be there. Moving them is left for later. It was
expected that the impact would be significant enough to be done in
a seperate commit.

powerpc: MD prototypes left in cpu.h. Comment added.

Suggested by: bde
Tested with: make universe (pc98 incomplete)

2 files changed, 6 insertions, 4 deletions

diff --git a/sys/powerpc/include/cpu.h b/sys/powerpc/include/cpu.h
index 84ffb3b..ae3893d 100644
--- a/sys/powerpc/include/cpu.h
+++ b/sys/powerpc/include/cpu.h
@@ -92,8 +92,13 @@ get_cyclecount(void)
 
 #define	cpu_getstack(td)	((td)->td_frame->fixreg[1])
 
-void	savectx(struct pcb *);
+void	cpu_halt(void);
+void	cpu_reset(void);
 void	fork_trampoline(void);
+void	swi_vm(void *);
+
+/* XXX the following should not be here. */
+void	savectx(struct pcb *);
 int	kcopy(const void *, void *, size_t);
 
 #endif	/* _MACHINE_CPU_H_ */
diff --git a/sys/powerpc/include/md_var.h b/sys/powerpc/include/md_var.h
index cc57618..9e98647 100644
--- a/sys/powerpc/include/md_var.h
+++ b/sys/powerpc/include/md_var.h
@@ -51,10 +51,7 @@ struct cam_sim;
 struct pcicfg;
 
 void	busdma_swi(void);
-void	cpu_halt(void);
-void	cpu_reset(void);
 int	is_physical_memory(vm_offset_t addr);
-void	swi_vm(void *);
 
 void	decr_init(void);