diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-07-29 15:24:48 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-07-29 15:24:48 +0800 |
| commit | 3709a1288a2c2d300a560ba24d70410a0dfb25c5 (patch) | |
| tree | 0769a9ead1d83b1fe737d643f6b9827988f0746b /arch/sparc | |
| parent | 2764df8715cc5570e96780e7b9e516002069e486 (diff) | |
| parent | 77917ecac9c37f9f02e7954b617df8f824894778 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-rt
Conflicts:
arch/x86/Kconfig
kernel/Kconfig.locks
kernel/trace/trace.c
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 4282c9d26c11..aa150fdc8f55 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -77,6 +77,7 @@ config SPARC64 select ARCH_HAVE_NMI_SAFE_CMPXCHG select HAVE_C_RECORDMCOUNT select NO_BOOTMEM + select ARCH_SUPPORTS_ATOMIC_RMW config ARCH_DEFCONFIG string |