diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
| commit | fff34b3412b9401a76ba9d021db1bd91cb0e02b6 (patch) | |
| tree | 870ed2d1555004e7939d15b5099017aae61c97b8 /arch/powerpc/include/asm/processor.h | |
| parent | 28e1e58fb668e262648fb8ee8a24154633f40507 (diff) | |
| parent | 636802ef96eebe279b22ad9f9dacfe29291e45c7 (diff) | |
Merge branch 'merge' into next
Brings in various bug fixes from 3.6-rcX
Diffstat (limited to 'arch/powerpc/include/asm/processor.h')
| -rw-r--r-- | arch/powerpc/include/asm/processor.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h index e0f6710d1983..7e7fa13e4667 100644 --- a/arch/powerpc/include/asm/processor.h +++ b/arch/powerpc/include/asm/processor.h | |||
| @@ -387,6 +387,7 @@ extern unsigned long cpuidle_disable; | |||
| 387 | enum idle_boot_override {IDLE_NO_OVERRIDE = 0, IDLE_POWERSAVE_OFF}; | 387 | enum idle_boot_override {IDLE_NO_OVERRIDE = 0, IDLE_POWERSAVE_OFF}; |
| 388 | 388 | ||
| 389 | extern int powersave_nap; /* set if nap mode can be used in idle loop */ | 389 | extern int powersave_nap; /* set if nap mode can be used in idle loop */ |
| 390 | extern void power7_nap(void); | ||
| 390 | 391 | ||
| 391 | #ifdef CONFIG_PSERIES_IDLE | 392 | #ifdef CONFIG_PSERIES_IDLE |
| 392 | extern void update_smt_snooze_delay(int snooze); | 393 | extern void update_smt_snooze_delay(int snooze); |