From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 16 Dec 2011 00:09:21 +0000 (+1100)
Subject: Merge branch 'kexec' into next
X-Git-Tag: v3.3-rc1~181^2~38
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=43ca5d347acc0dcae988dbd38b5bb5a930744a75;p=~emulex%2Finfiniband.git

Merge branch 'kexec' into next
---

43ca5d347acc0dcae988dbd38b5bb5a930744a75
diff --cc arch/powerpc/platforms/pseries/setup.c
index 164839cb9fc,992d797e07d..f79f1278dfc
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@@ -349,23 -351,10 +349,25 @@@ static int alloc_dispatch_log_kmem_cach
  }
  early_initcall(alloc_dispatch_log_kmem_cache);
  
 +static void pSeries_idle(void)
 +{
 +	/* This would call on the cpuidle framework, and the back-end pseries
 +	 * driver to  go to idle states
 +	 */
 +	if (cpuidle_idle_call()) {
 +		/* On error, execute default handler
 +		 * to go into low thread priority and possibly
 +		 * low power mode.
 +		 */
 +		HMT_low();
 +		HMT_very_low();
 +	}
 +}
 +
  static void __init pSeries_setup_arch(void)
  {
+ 	panic_timeout = 10;
+ 
  	/* Discover PIC type and setup ppc_md accordingly */
  	pseries_discover_pic();