bitkeeper revision 1.1159.17.19 (411b929cWqTc_xtMch0ol_CgtZ8PJQ)

Merge 2.4 and 2.6 reboot code.

3 files changed, 3 insertions, 22 deletions

diff --git a/linux-2.4.26-xen-sparse/arch/xen/kernel/Makefile b/linux-2.4.26-xen-sparse/arch/xen/kernel/Makefile
index 000e40934f..2d669c8f9e 100644
--- a/linux-2.4.26-xen-sparse/arch/xen/kernel/Makefile
+++ b/linux-2.4.26-xen-sparse/arch/xen/kernel/Makefile
@@ -10,7 +10,8 @@ export-objs     := i386_ksyms.o
 
 obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o  \
 		ptrace.o ioport.o ldt.o setup.o time.o sys_i386.o \
-		i386_ksyms.o i387.o evtchn.o ctrl_if.o pci-dma.o
+		i386_ksyms.o i387.o evtchn.o ctrl_if.o pci-dma.o \
+		reboot.o
 
 ifdef CONFIG_PCI
 obj-y	+= pci-i386.o pci-pc.o
diff --git a/linux-2.4.26-xen-sparse/arch/xen/kernel/process.c b/linux-2.4.26-xen-sparse/arch/xen/kernel/process.c
index 56cabca2a9..d03acd64a1 100644
--- a/linux-2.4.26-xen-sparse/arch/xen/kernel/process.c
+++ b/linux-2.4.26-xen-sparse/arch/xen/kernel/process.c
@@ -115,27 +115,6 @@ void cpu_idle (void)
     }
 }
 
-void machine_restart(char *__unused)
-{
-    /* We really want to get pending console data out before we die. */
-    extern void xencons_force_flush(void);
-    xencons_force_flush();
-    HYPERVISOR_reboot();
-}
-
-void machine_halt(void)
-{
-    machine_power_off();
-}
-
-void machine_power_off(void)
-{
-    /* We really want to get pending console data out before we die. */
-    extern void xencons_force_flush(void);
-    xencons_force_flush();
-    HYPERVISOR_shutdown();
-}
-
 extern void show_trace(unsigned long* esp);
 
 void show_regs(struct pt_regs * regs)
diff --git a/linux-2.4.26-xen-sparse/mkbuildtree b/linux-2.4.26-xen-sparse/mkbuildtree
index 8396693b74..870df2cfbf 100755
--- a/linux-2.4.26-xen-sparse/mkbuildtree
+++ b/linux-2.4.26-xen-sparse/mkbuildtree
@@ -222,6 +222,7 @@ ln -sf ../../i386/kernel/semaphore.c
 ln -sf ../../i386/kernel/sys_i386.c 
 ln -sf ../../../${LINUX_26}/arch/xen/kernel/ctrl_if.c
 ln -sf ../../../${LINUX_26}/arch/xen/kernel/evtchn.c
+ln -sf ../../../${LINUX_26}/arch/xen/kernel/reboot.c
 ln -sf ../../../${LINUX_26}/arch/xen/i386/kernel/ioport.c
 ln -sf ../../../${LINUX_26}/arch/xen/i386/kernel/pci-dma.c