diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-15 19:16:01 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-15 19:16:01 -0700 |
commit | edb581110d04c70a4be5723ff8862a0f523657dd (patch) | |
tree | a2f6e2a95b2c9fc8e64909ee0db74b39cd61f4a4 /arch/sparc/Kconfig | |
parent | 291b63c86aea8a571ddf913d41ab5156b8314dad (diff) | |
parent | 178a29600340bef5b13cd4157053679debe35351 (diff) | |
download | linux-edb581110d04c70a4be5723ff8862a0f523657dd.tar.gz linux-edb581110d04c70a4be5723ff8862a0f523657dd.tar.bz2 linux-edb581110d04c70a4be5723ff8862a0f523657dd.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Set HAVE_C_RECORDMCOUNT
sparc32: unbreak arch_write_unlock()
sparc64: remove unnecessary macros from spinlock_64.h
Diffstat (limited to 'arch/sparc/Kconfig')
-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 42c67beadcae..1a6f20d4e7e6 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -55,6 +55,7 @@ config SPARC64 select PERF_USE_VMALLOC select IRQ_PREFLOW_FASTEOI select ARCH_HAVE_NMI_SAFE_CMPXCHG + select HAVE_C_RECORDMCOUNT config ARCH_DEFCONFIG string |