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

Commit dc8e7e3e 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/x86/perf: fix power:cpu_idle double end events and throw cpu_idle events from the cpuidle layer
  intel_idle: open broadcast clock event
  cpuidle: CPUIDLE_FLAG_CHECK_BM is omap3_idle specific
  cpuidle: CPUIDLE_FLAG_TLB_FLUSHED is specific to intel_idle
  cpuidle: delete unused CPUIDLE_FLAG_SHALLOW, BALANCED, DEEP definitions
  SH, cpuidle: delete use of NOP CPUIDLE_FLAGS_SHALLOW
  cpuidle: delete NOP CPUIDLE_FLAG_POLL
  ACPI: processor_idle: delete use of NOP CPUIDLE_FLAGs
  cpuidle: Rename X86 specific idle poll state[0] from C0 to POLL
  ACPI, intel_idle: Cleanup idle= internal variables
  cpuidle: Make cpuidle_enable_device() call poll_idle_init()
  intel_idle: update Sandy Bridge core C-state residency targets
parents 2c79c69a 43952886

arch/arm/mach-omap2/cpuidle34xx.c

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ 


#define OMAP3_STATE_MAX OMAP3_STATE_C7



#define CPUIDLE_FLAG_CHECK_BM	0x10000	/* use omap3_enter_idle_bm() */



struct omap3_processor_cx {

	u8 valid;

	u8 type;

arch/ia64/include/asm/processor.h

+3 −2
Original line number Diff line number Diff line
@@ -717,8 +717,9 @@ prefetchw (const void *x) 
#define spin_lock_prefetch(x)	prefetchw(x)



extern unsigned long boot_option_idle_override;

extern unsigned long idle_halt;

extern unsigned long idle_nomwait;



enum idle_boot_override {IDLE_NO_OVERRIDE=0, IDLE_HALT, IDLE_FORCE_MWAIT,

			 IDLE_NOMWAIT, IDLE_POLL};



#endif /* !__ASSEMBLY__ */

arch/ia64/kernel/process.c

+1 −5
Original line number Diff line number Diff line
@@ -53,12 +53,8 @@ 


void (*ia64_mark_idle)(int);



unsigned long boot_option_idle_override = 0;

unsigned long boot_option_idle_override = IDLE_NO_OVERRIDE;

EXPORT_SYMBOL(boot_option_idle_override);

unsigned long idle_halt;

EXPORT_SYMBOL(idle_halt);

unsigned long idle_nomwait;

EXPORT_SYMBOL(idle_nomwait);

void (*pm_idle) (void);

EXPORT_SYMBOL(pm_idle);

void (*pm_power_off) (void);

arch/sh/kernel/cpu/shmobile/cpuidle.c

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ void sh_mobile_setup_cpuidle(void) 
	state->target_residency = 1 * 2;

	state->power_usage = 3;

	state->flags = 0;

	state->flags |= CPUIDLE_FLAG_SHALLOW;

	state->flags |= CPUIDLE_FLAG_TIME_VALID;

	state->enter = cpuidle_sleep_enter;

arch/x86/include/asm/processor.h

+3 −2
Original line number Diff line number Diff line
@@ -761,10 +761,11 @@ extern void select_idle_routine(const struct cpuinfo_x86 *c); 
extern void init_c1e_mask(void);



extern unsigned long		boot_option_idle_override;

extern unsigned long		idle_halt;

extern unsigned long		idle_nomwait;

extern bool			c1e_detected;



enum idle_boot_override {IDLE_NO_OVERRIDE=0, IDLE_HALT, IDLE_NOMWAIT,

			 IDLE_POLL, IDLE_FORCE_MWAIT};



extern void enable_sep_cpu(void);

extern int sysenter_setup(void);