Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35e51fe8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6 

* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
  cpuidle: stop depending on pm_idle
  x86 idle: move mwait_idle_with_hints() to where it is used
  cpuidle: replace xen access to x86 pm_idle and default_idle
  cpuidle: create bootparam "cpuidle.off=1"
  mrst_pmu: driver for Intel Moorestown Power Management Unit
parents c0c770e6 a0bfa137

Documentation/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -551,6 +551,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			/proc/<pid>/coredump_filter.

			See also Documentation/filesystems/proc.txt.



	cpuidle.off=1	[CPU_IDLE]

			disable the cpuidle sub-system



	cpcihp_generic=	[HW,PCI] Generic port I/O CompactPCI driver

			Format:

			<first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>]

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -3367,6 +3367,12 @@ F: drivers/net/ixgb/ 
F:	drivers/net/ixgbe/

F:	drivers/net/ixgbevf/



INTEL MRST PMU DRIVER

M:	Len Brown <len.brown@intel.com>

L:	linux-pm@lists.linux-foundation.org

S:	Supported

F:	arch/x86/platform/mrst/pmu.*



INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT

L:	linux-wireless@vger.kernel.org

S:	Orphan

arch/arm/kernel/process.c

+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/uaccess.h>

#include <linux/random.h>

#include <linux/hw_breakpoint.h>

#include <linux/cpuidle.h>



#include <asm/cacheflush.h>

#include <asm/leds.h>
@@ -196,6 +197,7 @@ void cpu_idle(void) 
				cpu_relax();

			} else {

				stop_critical_timings();

				if (cpuidle_call_idle())

					pm_idle();

				start_critical_timings();

				/*

arch/sh/kernel/idle.c

+4 −2
Original line number Diff line number Diff line
@@ -16,12 +16,13 @@ 
#include <linux/thread_info.h>

#include <linux/irqflags.h>

#include <linux/smp.h>

#include <linux/cpuidle.h>

#include <asm/pgalloc.h>

#include <asm/system.h>

#include <linux/atomic.h>

#include <asm/smp.h>



void (*pm_idle)(void) = NULL;

static void (*pm_idle)(void);



static int hlt_counter;
@@ -100,6 +101,7 @@ void cpu_idle(void) 
			local_irq_disable();

			/* Don't trace irqs off for idle */

			stop_critical_timings();

			if (cpuidle_call_idle())

				pm_idle();

			/*

			 * Sanity check to ensure that pm_idle() returns

arch/x86/include/asm/processor.h

+0 −2
Original line number Diff line number Diff line
@@ -751,8 +751,6 @@ static inline void __sti_mwait(unsigned long eax, unsigned long ecx) 
		     :: "a" (eax), "c" (ecx));

}



extern void mwait_idle_with_hints(unsigned long eax, unsigned long ecx);



extern void select_idle_routine(const struct cpuinfo_x86 *c);

extern void init_amd_e400_c1e_mask(void);