direct-io.hg

changeset 11347:f74c9368f6ff

[IA64] fix noreboot option

fix machine_hlt to support noreboot option.

Signed-off-by: Akio Takebe <takebe_akio@jp.fujitsu.com>
[modified to use existing cpu_halt() function in linux-xen files]
Signed-off-by: Alex Williamson <alex.williamson@hp.com>
author awilliam@xenbuild.aw
date Mon Aug 28 14:09:31 2006 -0600 (2006-08-28)
parents 8c4c5e1bf58a
children 6bf652c677c8
files xen/arch/ia64/linux-xen/process-linux-xen.c xen/arch/ia64/xen/domain.c
line diff
     1.1 --- a/xen/arch/ia64/linux-xen/process-linux-xen.c	Mon Aug 28 13:31:35 2006 -0600
     1.2 +++ b/xen/arch/ia64/linux-xen/process-linux-xen.c	Mon Aug 28 14:09:31 2006 -0600
     1.3 @@ -810,6 +810,7 @@ get_wchan (struct task_struct *p)
     1.4  	} while (count++ < 16);
     1.5  	return 0;
     1.6  }
     1.7 +#endif // !XEN
     1.8  
     1.9  void
    1.10  cpu_halt (void)
    1.11 @@ -834,6 +835,7 @@ cpu_halt (void)
    1.12  		ia64_pal_halt(min_power_state);
    1.13  }
    1.14  
    1.15 +#ifndef XEN
    1.16  void
    1.17  machine_restart (char *restart_cmd)
    1.18  {
     2.1 --- a/xen/arch/ia64/xen/domain.c	Mon Aug 28 13:31:35 2006 -0600
     2.2 +++ b/xen/arch/ia64/xen/domain.c	Mon Aug 28 14:09:31 2006 -0600
     2.3 @@ -1123,13 +1123,15 @@ void machine_restart(char * __unused)
     2.4  	while(1);
     2.5  }
     2.6  
     2.7 +extern void cpu_halt(void);
     2.8 +
     2.9  void machine_halt(void)
    2.10  {
    2.11  	console_start_sync();
    2.12  	if (running_on_sim)
    2.13  		printf ("machine_halt called.  spinning...\n");
    2.14  	else
    2.15 -		(*efi.reset_system)(EFI_RESET_SHUTDOWN,0,0,NULL);
    2.16 +		cpu_halt();
    2.17  	while(1);
    2.18  }
    2.19