[Gc-linux-cvs] linux/kernel kexec.c,1.3,1.4

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/kernel
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/kernel

Modified Files:
	kexec.c 
Log Message:
Forward to v2.6.31.


Index: kexec.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/kernel/kexec.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** kexec.c	25 Oct 2009 18:53:46 -0000	1.3
--- kexec.c	25 Oct 2009 18:56:56 -0000	1.4
***************
*** 1229,1233 ****
  
  	if (*crash_size > 0) {
! 		while (*cur != ' ' && *cur != '@')
  			cur++;
  		if (*cur == '@') {
--- 1229,1233 ----
  
  	if (*crash_size > 0) {
! 		while (*cur && *cur != ' ' && *cur != '@')
  			cur++;
  		if (*cur == '@') {
***************
*** 1449,1463 ****
  		}
  		suspend_console();
! 		error = device_suspend(PMSG_FREEZE);
  		if (error)
  			goto Resume_console;
! 		/* At this point, device_suspend() has been called,
! 		 * but *not* device_power_down(). We *must*
! 		 * device_power_down() now.  Otherwise, drivers for
  		 * some devices (e.g. interrupt controllers) become
  		 * desynchronized with the actual state of the
  		 * hardware at resume time, and evil weirdness ensues.
  		 */
! 		error = device_power_down(PMSG_FREEZE);
  		if (error)
  			goto Resume_devices;
--- 1449,1463 ----
  		}
  		suspend_console();
! 		error = dpm_suspend_start(PMSG_FREEZE);
  		if (error)
  			goto Resume_console;
! 		/* At this point, dpm_suspend_start() has been called,
! 		 * but *not* dpm_suspend_noirq(). We *must* call
! 		 * dpm_suspend_noirq() now.  Otherwise, drivers for
  		 * some devices (e.g. interrupt controllers) become
  		 * desynchronized with the actual state of the
  		 * hardware at resume time, and evil weirdness ensues.
  		 */
! 		error = dpm_suspend_noirq(PMSG_FREEZE);
  		if (error)
  			goto Resume_devices;
***************
*** 1487,1493 ****
   Enable_cpus:
  		enable_nonboot_cpus();
! 		device_power_up(PMSG_RESTORE);
   Resume_devices:
! 		device_resume(PMSG_RESTORE);
   Resume_console:
  		resume_console();
--- 1487,1493 ----
   Enable_cpus:
  		enable_nonboot_cpus();
! 		dpm_resume_noirq(PMSG_RESTORE);
   Resume_devices:
! 		dpm_resume_end(PMSG_RESTORE);
   Resume_console:
  		resume_console();