[xtensa-cvscommit] linux/arch/xtensa/kernel process.c,1.2,1.3 reset.c,1.1.1.1,1.2

[<joe...@us...>]

Update of /cvsroot/xtensa/linux/arch/xtensa/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv1903/arch/xtensa/kernel

Modified Files:
	process.c reset.c 
Log Message:


Fix three reset functions: machine_restart(), machine_halt(), and  machine_power_off().  They no longer call xt_panic() to hang the system, but try to do something meaningful in the context of Xtensa and the XT2000 or ISS platforms, as appropriate.


Index: process.c
===================================================================
RCS file: /cvsroot/xtensa/linux/arch/xtensa/kernel/process.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** process.c	6 Sep 2002 20:02:20 -0000	1.2
--- process.c	18 Oct 2002 21:57:26 -0000	1.3
***************
*** 38,43 ****
  #include <xtensa/hal.h>
  
- extern void xt_panic (void);
- 
  void cpu_idle(void)
  {
--- 38,41 ----

Index: reset.c
===================================================================
RCS file: /cvsroot/xtensa/linux/arch/xtensa/kernel/reset.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** reset.c	28 Aug 2002 16:10:14 -0000	1.1.1.1
--- reset.c	18 Oct 2002 21:57:27 -0000	1.2
***************
*** 9,39 ****
  
  
! void xt_panic(void);
  
! void machine_restart(char *command)
  {
! 	xt_panic();		/* XTFIXME:  machine_restart called in $LINUX/kernel/sys.c  */
! 
! /*
! XTFIXME [kcc]
! 	platform_restart(command);
! */
  }
  
  void machine_halt(void)
  {
! 	xt_panic();		/* XTFIXME:  machine_halt called in $LINUX/kernel/sys.c  */
! 
! /*
! 	platform_halt();
! */
  }
  
  void machine_power_off(void)
  {
! 	xt_panic();		/* XTFIXME:  machine_power_off called in $LINUX/kernel/sys.c  */
! 
! /*
! 	platform_power_off();
! */
  }
--- 9,37 ----
  
  
! void (*mach_restart)(char *);
! void (*mach_halt)(void);
! void (*mach_power_off)(void);
  
! void machine_restart(char * cmd)
  {
! 	if (mach_restart)
! 		mach_restart(cmd);
! 	printk (" ** No mach restart, looping forever! **\n");
! 	while (1);
  }
  
  void machine_halt(void)
  {
! 	if (mach_halt)
! 		mach_halt();
! 	printk (" ** No mach halt, looping forever! **\n");
! 	while (1);
  }
  
  void machine_power_off(void)
  {
! 	if (mach_power_off)
! 		mach_power_off();
! 	printk (" ** No mach power off, looping forever! **\n");
! 	while (1);
  }