diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
| commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
| tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /lib/Kconfig | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'lib/Kconfig')
| -rw-r--r-- | lib/Kconfig | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 991c98b..b3c8be0 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -51,6 +51,13 @@ config PERCPU_RWSEM config ARCH_USE_CMPXCHG_LOCKREF bool +config CMPXCHG_LOCKREF + def_bool y if ARCH_USE_CMPXCHG_LOCKREF + depends on SMP + depends on !GENERIC_LOCKBREAK + depends on !DEBUG_SPINLOCK + depends on !DEBUG_LOCK_ALLOC + config CRC_CCITT tristate "CRC-CCITT functions" help @@ -182,13 +189,6 @@ config AUDIT_GENERIC depends on AUDIT && !AUDIT_ARCH default y -config RANDOM32_SELFTEST - bool "PRNG perform self test on init" - default n - help - This option enables the 32 bit PRNG library functions to perform a - self test on initialization. - # # compression support is select'ed if needed # @@ -322,20 +322,6 @@ config TEXTSEARCH_FSM config BTREE boolean -config ASSOCIATIVE_ARRAY - bool - help - Generic associative array. Can be searched and iterated over whilst - it is being modified. It is also reasonably quick to search and - modify. The algorithms are non-recursive, and the trees are highly - capacious. - - See: - - Documentation/assoc_array.txt - - for more information. - config HAS_IOMEM boolean depends on !NO_IOMEM |