diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-03-21 15:17:22 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-03-21 15:17:26 +1100 |
| commit | 67ae3b36794de69d58e66fb50be0fa0d68574c17 (patch) | |
| tree | 9fb9a287a227dcd4c9da85c8ec36b73a4727ac1b /init | |
| parent | e224ef010790d873c4672a408f442c08b901567f (diff) | |
| parent | e2c479cc9dca10a0d846c270cc29b8098409b273 (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/arm/mach-imx/pm-imx6q.c
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-zynq/Kconfig
arch/x86/include/asm/topology.h
arch/x86/kernel/cpu/perf_event_intel_uncore.c
arch/x86/pci/numaq_32.c
arch/x86/pci/visws.c
drivers/clocksource/Kconfig
drivers/pci/Makefile
drivers/video/Kconfig
drivers/video/Makefile
drivers/video/fbdev/sgivwfb.c
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index d4ec53d3c211..f0d48406d1ba 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1390,6 +1390,13 @@ config FUTEX support for "fast userspace mutexes". The resulting kernel may not run glibc-based applications correctly. +config HAVE_FUTEX_CMPXCHG + bool + help + Architectures should select this if futex_atomic_cmpxchg_inatomic() + is implemented and always working. This removes a couple of runtime + checks. + config EPOLL bool "Enable eventpoll support" if EXPERT default y |