diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-15 17:04:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-15 17:04:00 -0400 |
| commit | 37cae5e24981f4619372e6a29456d34e4cbdc5e2 (patch) | |
| tree | d234d751ccb5f46a2632aa9ccffbd0cdbad31941 /arch/Kconfig | |
| parent | d21572c5157174c8b13e892e19e09d70e06b4807 (diff) | |
| parent | b47430d3adbedbfdb5979ba4874f5dadf94f16b1 (diff) | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core fixes from Thomas Gleixner:
- Two fixlets for the fallout of the generic idle task conversion
- Documentation update
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
rcu/idle: Wrap cpu-idle poll mode within rcu_idle_enter/exit
idle: Fix hlt/nohlt command-line handling in new generic idle
kthread: Document ways of reducing OS jitter due to per-CPU kthreads
Diffstat (limited to 'arch/Kconfig')
| -rw-r--r-- | arch/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index dd0e8eb8042f..a4429bcd609e 100644 --- a/arch/Kconfig +++ b/arch/Kconfig | |||
| @@ -213,6 +213,9 @@ config USE_GENERIC_SMP_HELPERS | |||
| 213 | config GENERIC_SMP_IDLE_THREAD | 213 | config GENERIC_SMP_IDLE_THREAD |
| 214 | bool | 214 | bool |
| 215 | 215 | ||
| 216 | config GENERIC_IDLE_POLL_SETUP | ||
| 217 | bool | ||
| 218 | |||
| 216 | # Select if arch init_task initializer is different to init/init_task.c | 219 | # Select if arch init_task initializer is different to init/init_task.c |
| 217 | config ARCH_INIT_TASK | 220 | config ARCH_INIT_TASK |
| 218 | bool | 221 | bool |