aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-02 16:47:29 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-02 16:47:29 -0400
commite6d9bfc63813882c896bf7ea6f6b14ca7b50b755 (patch)
tree68decf00726f6f415cee04a62e68cc60b37f380b /arch/powerpc/Kconfig
parent235c7b9feb8779c7c289ed614324baebf3651bf9 (diff)
parent0888839c5b62c44a55ac9d28acc273ba663c65ea (diff)
Merge branch 'powernv-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc non-virtualized cpuidle from Ben Herrenschmidt: "This is the branch I mentioned in my other pull request which contains our improved cpuidle support for the "powernv" platform (non-virtualized). It adds support for the "fast sleep" feature of the processor which provides higher power savings than our usual "nap" mode but at the cost of losing the timers while asleep, and thus exploits the new timer broadcast framework to work around that limitation. It's based on a tip timer tree that you seem to have already merged" * 'powernv-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: cpuidle/powernv: Parse device tree to setup idle states cpuidle/powernv: Add "Fast-Sleep" CPU idle state powerpc/powernv: Add OPAL call to resync timebase on wakeup powerpc/powernv: Add context management for Fast Sleep powerpc: Split timer_interrupt() into timer handling and interrupt handling routines powerpc: Implement tick broadcast IPI as a fixed IPI message powerpc: Free up the slot of PPC_MSG_CALL_FUNC_SINGLE IPI message
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r--arch/powerpc/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 05e532984c13..f3d7846bc9b2 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -130,6 +130,8 @@ config PPC
130 select GENERIC_CMOS_UPDATE 130 select GENERIC_CMOS_UPDATE
131 select GENERIC_TIME_VSYSCALL_OLD 131 select GENERIC_TIME_VSYSCALL_OLD
132 select GENERIC_CLOCKEVENTS 132 select GENERIC_CLOCKEVENTS
133 select GENERIC_CLOCKEVENTS_BROADCAST if SMP
134 select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
133 select GENERIC_STRNCPY_FROM_USER 135 select GENERIC_STRNCPY_FROM_USER
134 select GENERIC_STRNLEN_USER 136 select GENERIC_STRNLEN_USER
135 select HAVE_MOD_ARCH_SPECIFIC 137 select HAVE_MOD_ARCH_SPECIFIC