Merge branch 'kexec' into next
Benjamin Herrenschmidt [Fri, 16 Dec 2011 00:09:21 +0000 (11:09 +1100)]
1  2 
arch/powerpc/include/asm/system.h
arch/powerpc/platforms/pseries/setup.c

Simple merge
@@@ -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();