From: 黄涛 <huangtao@rock-chips.com>
Date: Mon, 15 Oct 2012 03:56:57 +0000 (+0800)
Subject: Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
X-Git-Tag: firefly_0821_release~8420
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=70c481fac3570139f4a3081dbb81ded192260019;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

Conflicts:
	Makefile
---

70c481fac3570139f4a3081dbb81ded192260019
diff --cc kernel/sys.c
index 61dfac580989,dd29555462c3..1f4f15c40987
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@@ -345,12 -333,8 +345,13 @@@ void kernel_restart_prepare(char *cmd
   */
  void kernel_restart(char *cmd)
  {
 +	/*
 +	*  debug trace
 +	*/
 +	restart_dbg("%s->%d->cmd=%s",__FUNCTION__,__LINE__,cmd);
 +	
  	kernel_restart_prepare(cmd);
+ 	disable_nonboot_cpus();
  	if (!cmd)
  		printk(KERN_EMERG "Restarting system.\n");
  	else