Merge branch 'kexec' into next

diff --cc arch/powerpc/include/asm/system.h
Simple merge

diff --cc arch/powerpc/platforms/pseries/setup.c
index 164839cb9fcde78b617935f566962350016675da,992d797e07da28dde8bf2272250715b6ed3766d3..f79f1278dfca84ad03ac28d1c23fe542da34d2a4
--- 1/arch/powerpc/platforms/pseries/setup.c
--- 2/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();